diff --git a/netclient/functions/daemon.go b/netclient/functions/daemon.go
index 662a7e03..70128430 100644
--- a/netclient/functions/daemon.go
+++ b/netclient/functions/daemon.go
@@ -210,7 +210,7 @@ func NewTLSConfig(server string) *tls.Config {
 func setupMQTT(cfg *config.ClientConfig, publish bool) (mqtt.Client, error) {
 	opts := mqtt.NewClientOptions()
 	server := cfg.Server.Server
-	opts.AddBroker("ssl://" + server + servercfg.GetMQPort())
+	opts.AddBroker("ssl://" + server + ":" + servercfg.GetMQPort())
 	opts.SetTLSConfig(NewTLSConfig(server))
 	opts.SetClientID(ncutils.MakeRandomString(23))
 	opts.SetDefaultPublishHandler(All)
diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go
index 0191596c..00754a6d 100644
--- a/servercfg/serverconf.go
+++ b/servercfg/serverconf.go
@@ -224,8 +224,7 @@ func GetMessageQueueEndpoint() string {
 	} else if config.Config.Server.MQHOST != "" {
 		host = config.Config.Server.MQHOST
 	}
-	//Do we want MQ port configurable???
-	return host + GetMQServerPort()
+	return host + ":" + GetMQServerPort()
 }
 
 // GetMasterKey - gets the configured master key of server