diff --git a/homeassistant/components/mqtt/server.py b/homeassistant/components/mqtt/server.py
index dda2214ce46..3373149a013 100644
--- a/homeassistant/components/mqtt/server.py
+++ b/homeassistant/components/mqtt/server.py
@@ -40,12 +40,12 @@ def async_start(hass, password, server_config):
     from hbmqtt.broker import Broker, BrokerException
 
     passwd = tempfile.NamedTemporaryFile()
+
+    gen_server_config, client_config = generate_config(hass, passwd, password)
+
     try:
         if server_config is None:
-            server_config, client_config = generate_config(
-                hass, passwd, password)
-        else:
-            client_config = None
+            server_config = gen_server_config
 
         broker = Broker(server_config, hass.loop)
         yield from broker.start()