diff --git a/minecraft-server/start-minecraft.sh b/minecraft-server/start-minecraft.sh
index 5563dff7..a8bda0a4 100755
--- a/minecraft-server/start-minecraft.sh
+++ b/minecraft-server/start-minecraft.sh
@@ -398,9 +398,9 @@ fi
 # If we have a bootstrap.txt file... feed that in to the server stdin
 if [ -f /data/bootstrap.txt ];
 then
-    exec java $JVM_OPTS -jar $SERVER $* < /data/bootstrap.txt
+    exec java $JVM_OPTS -jar $SERVER "$@" < /data/bootstrap.txt
 else
-    exec java $JVM_OPTS -jar $SERVER $*
+    exec java $JVM_OPTS -jar $SERVER "$@"
 fi
 
 exec java $JVM_OPTS -jar $SERVER
diff --git a/minecraft-server/start.sh b/minecraft-server/start.sh
index ffaeb82b..a335aa7b 100755
--- a/minecraft-server/start.sh
+++ b/minecraft-server/start.sh
@@ -16,4 +16,4 @@ mkdir -p /home/minecraft
 chown minecraft: /home/minecraft
 
 echo "Switching to user 'minecraft'"
-exec sudo -E -u minecraft /start-minecraft $*
+exec sudo -E -u minecraft /start-minecraft "$@"