diff --git a/client/conf/server.properties.in b/client/conf/server.properties.in
index f255128555c..6cb56922b48 100644
--- a/client/conf/server.properties.in
+++ b/client/conf/server.properties.in
@@ -16,7 +16,8 @@
 # under the License.
 
 # The binding interface for the management server
-bind.interface=::
+# The management server will listen on all interfaces by default
+# bind.interface=::
 
 # The service context path where URL requests should be served
 context.path=/client
diff --git a/client/src/org/apache/cloudstack/ServerDaemon.java b/client/src/org/apache/cloudstack/ServerDaemon.java
index 985b67b755a..6d273834e4b 100644
--- a/client/src/org/apache/cloudstack/ServerDaemon.java
+++ b/client/src/org/apache/cloudstack/ServerDaemon.java
@@ -85,7 +85,7 @@ public class ServerDaemon implements Daemon {
     private int sessionTimeout = 30;
     private boolean httpsEnable = false;
     private String accessLogFile = "access.log";
-    private String bindInterface = "";
+    private String bindInterface = null;
     private String contextPath = "/client";
     private String keystoreFile;
     private String keystorePassword;
@@ -117,7 +117,7 @@ public class ServerDaemon implements Daemon {
             if (properties == null) {
                 return;
             }
-            setBindInterface(properties.getProperty(BIND_INTERFACE, ""));
+            setBindInterface(properties.getProperty(BIND_INTERFACE, null));
             setContextPath(properties.getProperty(CONTEXT_PATH, "/client"));
             setHttpPort(Integer.valueOf(properties.getProperty(HTTP_PORT, "8080")));
             setHttpsEnable(Boolean.valueOf(properties.getProperty(HTTPS_ENABLE, "false")));