diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
index a02bc2215c4..dd02d5a5a38 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/windows/daemon.bat
@@ -3,6 +3,8 @@ REM
 REM Start an RSE Windows Daemon
 REM Usage: daemon.bat [<port> | <low port>-<high port>] [ <low server port>-<high server port>]
 REM
+setlocal
+
 SET DaemonPort=4035
 SET ServerPortRange=
 IF NOT "%1"=="" SET DaemonPort=%1
@@ -33,3 +35,4 @@ GOTO Done
 pause
 
 :Done
+endlocal
\ No newline at end of file