diff --git a/homeassistant/components/http.py b/homeassistant/components/http.py
index 00b35dda8c9..7d8fd8620b4 100644
--- a/homeassistant/components/http.py
+++ b/homeassistant/components/http.py
@@ -77,7 +77,9 @@ def setup(hass, config):
                          name='HTTP-server').start())
 
     hass.http = server
-    hass.config.api = rem.API(util.get_local_ip(), api_password, server_port,
+    hass.config.api = rem.API(server_host if server_host != '0.0.0.0'
+                              else util.get_local_ip(),
+                              api_password, server_port,
                               ssl_certificate is not None)
 
     return True