diff --git a/clients/mqtt_client.go b/clients/mqtt_client.go
index d5661b5c..02a9d24e 100644
--- a/clients/mqtt_client.go
+++ b/clients/mqtt_client.go
@@ -7,9 +7,11 @@ import (
 	"log"
 	"encoding/json"
 	"net/http"
+	"strconv"
 
 	"github.com/mainflux/mainflux/db"
 	"github.com/mainflux/mainflux/models"
+	"github.com/mainflux/mainflux/config"
 
 	"github.com/krylovsk/gosenml"
 	"gopkg.in/mgo.v2/bson"
@@ -48,10 +50,10 @@ var msgHandler mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message)
 	fmt.Println(status)
 }
 
-func (mqc *MqttConn) MqttSub() {
+func (mqc *MqttConn) MqttSub(cfg config.Config) {
 	// Create a ClientOptions struct setting the broker address, clientid, turn
 	// off trace output and set the default message handler
-	mqc.Opts = mqtt.NewClientOptions().AddBroker("tcp://localhost:1883")
+	mqc.Opts = mqtt.NewClientOptions().AddBroker("tcp://" + cfg.MqttHost + ":" + strconv.Itoa(cfg.MqttPort))
 	mqc.Opts.SetClientID("mainflux")
 	mqc.Opts.SetDefaultPublishHandler(msgHandler)
 
diff --git a/config/config-docker.toml b/config/config-docker.toml
index 100f0ff1..f15f9acf 100644
--- a/config/config-docker.toml
+++ b/config/config-docker.toml
@@ -17,4 +17,4 @@ mongoDatabase = "mainflux"
 
 # MQTT
 mqttHost = "emqttd"
-mqttPort = 1833
+mqttPort = 1883
diff --git a/config/config.toml b/config/config.toml
index 67e3aee2..a7807cf8 100644
--- a/config/config.toml
+++ b/config/config.toml
@@ -17,4 +17,4 @@ mongoDatabase = "mainflux"
 
 # MQTT
 mqttHost = "localhost"
-mqttPort = 1833
+mqttPort = 1883
diff --git a/main.go b/main.go
index b860ec47..c5653586 100644
--- a/main.go
+++ b/main.go
@@ -123,7 +123,7 @@ func main() {
 	// MQTT 
 	mqc := new(clients.MqttConn)
 	//Sub to everything comming on all channels of all devices
-	mqc.MqttSub()
+	mqc.MqttSub(cfg)
 
 	// Serve HTTP
 	go servers.HttpServer(cfg)