diff --git a/entrypoint.sh b/entrypoint.sh
index 3b01fff..71ed701 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -25,11 +25,11 @@ if [ -n "$ITEM_RESPAWN" ]; then
 fi
 
 if [ -n "$SV_HOSTNAME" ]; then
-  echo "set sv_hostname $SV_HOSTNAME" >> /srv/server.cfg
+  echo "set sv_hostname \"$SV_HOSTNAME\"" >> /srv/server.cfg
 fi
 
 if [ -n "$RCON_PASSWORD" ]; then
-  echo "set sv_rconpassword $RCON_PASSWORD" >> /srv/server.cfg
+  echo "set sv_rconpassword \"$RCON_PASSWORD\"" >> /srv/server.cfg
 fi
 
 UPDATE_MASTER=${UPDATE_MASTER:-"true"}