diff --git a/cmd/dendrite-appservice-server/main.go b/cmd/dendrite-appservice-server/main.go
index 648d0b97e..f203969f4 100644
--- a/cmd/dendrite-appservice-server/main.go
+++ b/cmd/dendrite-appservice-server/main.go
@@ -35,9 +35,6 @@ func main() {
 		base, accountDB, deviceDB, federation, alias, query, cache,
 	)
 
-	if base.Cfg.Bind.AppServiceAPI != "" {
-		base.SetupAndServeHTTP(string(base.Cfg.Bind.AppServiceAPI))
-	} else {
-		base.SetupAndServeHTTP(string(base.Cfg.Listen.AppServiceAPI))
-	}
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.AppServiceAPI), string(base.Cfg.Listen.AppServiceAPI))
+
 }
diff --git a/cmd/dendrite-client-api-server/main.go b/cmd/dendrite-client-api-server/main.go
index 239549e90..0cbb40e61 100644
--- a/cmd/dendrite-client-api-server/main.go
+++ b/cmd/dendrite-client-api-server/main.go
@@ -44,9 +44,6 @@ func main() {
 		alias, input, query, typingInputAPI, asQuery, transactions.New(),
 	)
 
-	if base.Cfg.Bind.ClientAPI != "" {
-		base.SetupAndServeHTTP(string(base.Cfg.Bind.ClientAPI))
-	} else {
-		base.SetupAndServeHTTP(string(base.Cfg.Listen.ClientAPI))
-	}
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.ClientAPI), string(base.Cfg.Listen.ClientAPI))
+
 }
diff --git a/cmd/dendrite-federation-api-server/main.go b/cmd/dendrite-federation-api-server/main.go
index d38f7134a..c83845d25 100644
--- a/cmd/dendrite-federation-api-server/main.go
+++ b/cmd/dendrite-federation-api-server/main.go
@@ -39,9 +39,6 @@ func main() {
 		alias, input, query, asQuery,
 	)
 
-	if base.Cfg.Bind.FederationAPI != "" {
-		base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationAPI))
-	} else {
-		base.SetupAndServeHTTP(string(base.Cfg.Listen.FederationAPI))
-	}
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationAPI), string(base.Cfg.Listen.FederationAPI))
+
 }
diff --git a/cmd/dendrite-federation-sender-server/main.go b/cmd/dendrite-federation-sender-server/main.go
index cf1d73112..71fc0b015 100644
--- a/cmd/dendrite-federation-sender-server/main.go
+++ b/cmd/dendrite-federation-sender-server/main.go
@@ -32,9 +32,6 @@ func main() {
 		base, federation, query,
 	)
 
-	if base.Cfg.Bind.FederationSender != "" {
-		base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationSender))
-	} else {
-		base.SetupAndServeHTTP(string(base.Cfg.Listen.FederationSender))
-	}
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationSender), string(base.Cfg.Listen.FederationSender))
+
 }
diff --git a/cmd/dendrite-media-api-server/main.go b/cmd/dendrite-media-api-server/main.go
index 6d8ada452..a818db73a 100644
--- a/cmd/dendrite-media-api-server/main.go
+++ b/cmd/dendrite-media-api-server/main.go
@@ -28,9 +28,6 @@ func main() {
 
 	mediaapi.SetupMediaAPIComponent(base, deviceDB)
 
-	if base.Cfg.Bind.MediaAPI != "" {
-		base.SetupAndServeHTTP(string(base.Cfg.Bind.MediaAPI))
-	} else {
-		base.SetupAndServeHTTP(string(base.Cfg.Listen.MediaAPI))
-	}
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.MediaAPI), string(base.Cfg.Listen.MediaAPI))
+
 }
diff --git a/cmd/dendrite-public-rooms-api-server/main.go b/cmd/dendrite-public-rooms-api-server/main.go
index daa88e678..b60eed92a 100644
--- a/cmd/dendrite-public-rooms-api-server/main.go
+++ b/cmd/dendrite-public-rooms-api-server/main.go
@@ -28,9 +28,6 @@ func main() {
 
 	publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB)
 
-	if base.Cfg.Bind.PublicRoomsAPI != "" {
-		base.SetupAndServeHTTP(string(base.Cfg.Bind.PublicRoomsAPI))
-	} else {
-		base.SetupAndServeHTTP(string(base.Cfg.Listen.PublicRoomsAPI))
-	}
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.PublicRoomsAPI), string(base.Cfg.Listen.PublicRoomsAPI))
+
 }
diff --git a/cmd/dendrite-room-server/main.go b/cmd/dendrite-room-server/main.go
index c14391685..41b705755 100644
--- a/cmd/dendrite-room-server/main.go
+++ b/cmd/dendrite-room-server/main.go
@@ -28,9 +28,6 @@ func main() {
 
 	roomserver.SetupRoomServerComponent(base)
 
-	if base.Cfg.Bind.RoomServer != "" {
-		base.SetupAndServeHTTP(string(base.Cfg.Bind.RoomServer))
-	} else {
-		base.SetupAndServeHTTP(string(base.Cfg.Listen.RoomServer))
-	}
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.RoomServer), string(base.Cfg.Listen.RoomServer))
+
 }
diff --git a/cmd/dendrite-sync-api-server/main.go b/cmd/dendrite-sync-api-server/main.go
index 54f04471b..1c47ec525 100644
--- a/cmd/dendrite-sync-api-server/main.go
+++ b/cmd/dendrite-sync-api-server/main.go
@@ -31,9 +31,6 @@ func main() {
 
 	syncapi.SetupSyncAPIComponent(base, deviceDB, accountDB, query)
 
-	if base.Cfg.Bind.SyncAPI != "" {
-		base.SetupAndServeHTTP(string(base.Cfg.Bind.SyncAPI))
-	} else {
-		base.SetupAndServeHTTP(string(base.Cfg.Listen.SyncAPI))
-	}
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.SyncAPI), string(base.Cfg.Listen.SyncAPI))
+
 }
diff --git a/cmd/dendrite-typing-server/main.go b/cmd/dendrite-typing-server/main.go
index 53a8fdf0d..461eb7144 100644
--- a/cmd/dendrite-typing-server/main.go
+++ b/cmd/dendrite-typing-server/main.go
@@ -32,9 +32,6 @@ func main() {
 
 	typingserver.SetupTypingServerComponent(base, cache.NewTypingCache())
 
-	if base.Cfg.Bind.TypingServer != "" {
-		base.SetupAndServeHTTP(string(base.Cfg.Bind.TypingServer))
-	} else {
-		base.SetupAndServeHTTP(string(base.Cfg.Listen.TypingServer))
-	}
+	base.SetupAndServeHTTP(string(base.Cfg.Bind.TypingServer), string(base.Cfg.Listen.TypingServer))
+
 }
diff --git a/common/basecomponent/base.go b/common/basecomponent/base.go
index 6a20aca3b..29abd7ee9 100644
--- a/common/basecomponent/base.go
+++ b/common/basecomponent/base.go
@@ -150,7 +150,15 @@ func (b *BaseDendrite) CreateFederationClient() *gomatrixserverlib.FederationCli
 
 // SetupAndServeHTTP sets up the HTTP server to serve endpoints registered on
 // ApiMux under /api/ and adds a prometheus handler under /metrics.
-func (b *BaseDendrite) SetupAndServeHTTP(addr string) {
+func (b *BaseDendrite) SetupAndServeHTTP(bindaddr string, listenaddr string) {
+
+	var addr string
+	if bindaddr != "" {
+		addr = bindaddr
+	} else {
+		addr = listenaddr
+	}
+
 	common.SetupHTTPAPI(http.DefaultServeMux, common.WrapHandlerInCORS(b.APIMux))
 	logrus.Infof("Starting %s server on %s", b.componentName, addr)