diff --git a/config/alfresco/subsystems/fileServers/default/file-servers.properties b/config/alfresco/subsystems/fileServers/default/file-servers.properties
index 240aaa0447..fbbfa3ffc0 100644
--- a/config/alfresco/subsystems/fileServers/default/file-servers.properties
+++ b/config/alfresco/subsystems/fileServers/default/file-servers.properties
@@ -5,7 +5,7 @@ cifs.serverName=${localname}A
 cifs.domain=
 cifs.broadcast=255.255.255.255
 # An empty value indicates bind to all available network adapters
-cifs.bindto=0.0.0.0
+cifs.bindto=
 cifs.ipv6.enabled=false
 cifs.hostannounce=true
 # Enable the use of asynchronous sockets/NIO code
diff --git a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java
index 3aa2dfe713..c37da5f286 100644
--- a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java
+++ b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java
@@ -331,7 +331,8 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean
 
                 cifsConfig.setSMBBindAddress(bindAddr);
             }
-            else if ((bindTo = cifsConfigBean.getBindToAddress()) != null && !bindTo.equals(BIND_TO_IGNORE))
+            else if ((bindTo = cifsConfigBean.getBindToAddress()) != null && bindTo.length() > 0
+                    && !bindTo.equals(BIND_TO_IGNORE))
             {
 
                 // Validate the bind address