diff --git a/scripts/entry.sh b/scripts/entry.sh
index 1cb5a47..81d7912 100644
--- a/scripts/entry.sh
+++ b/scripts/entry.sh
@@ -75,7 +75,7 @@ fi
 
 # You can choose a different servername by using this option when starting the server.
 if [ -n "${SERVERNAME}" ]; then
-  ARGS="${ARGS} -servername ${SERVERNAME}"
+  ARGS="${ARGS} -servername \"${SERVERNAME}\""
 else
   # If not servername is set, use the default name in the next step
   SERVERNAME="servertest"