diff --git a/start-finalSetupServerProperties b/start-finalSetupServerProperties
index a4c7c62c..62e02dfd 100644
--- a/start-finalSetupServerProperties
+++ b/start-finalSetupServerProperties
@@ -31,6 +31,10 @@ function customizeServerProps {
     log "Creating whitelist"
     setServerProp "whitelist" "true"
     setServerProp "white-list" "true"
+  else
+    log "Disabling whitelist"
+    setServerProp "whitelist" "false"
+    setServerProp "white-list" "false"
   fi
 
   # If not provided, generate a reasonable default message-of-the-day,