diff --git a/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java b/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
index f7430b528a..b7c2b91d90 100644
--- a/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
+++ b/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
@@ -819,7 +819,7 @@ public class ServerConfiguration extends AbstractLifecycleBean
 
             // Make sure the CIFS server name does not match the local server name
 
-            if (hostName.equals(srvName))
+            if (hostName.equals(srvName) && getPlatformType() == PlatformType.WINDOWS)
                 throw new AlfrescoRuntimeException("CIFS server name must be unique");
         }