diff --git a/modules/runtime/src/bin/server.bat b/modules/runtime/src/bin/server.bat
index e268c23ddc4..7421eaed14c 100644
--- a/modules/runtime/src/bin/server.bat
+++ b/modules/runtime/src/bin/server.bat
@@ -40,7 +40,10 @@ goto fail
 set XP_INSTALL=%DIRNAME%..
 set DEFAULT_JAVA_OPTS=-XX:-OmitStackTraceInFastThrow -XX:+AlwaysPreTouch
 set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
-set CONSTANT_XP_OPTS=-XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCIProduct -XX:-UnlockExperimentalVMOptions -Dfile.encoding=UTF8 -Dnashorn.args="--no-deprecation-warning" -Dmapper.allow_dots_in_name=true --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
+set CONSTANT_XP_OPTS=-Dfile.encoding=UTF8 -Dmapper.allow_dots_in_name=true --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
+
+"%JAVA_EXE%" --list-modules -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCIProduct >NUL 2>NUL
+if %ERRORLEVEL% EQU 0 set CONSTANT_XP_OPTS=-XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCIProduct %CONSTANT_XP_OPTS%
 
 if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
 if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS%
diff --git a/modules/runtime/src/bin/server.sh b/modules/runtime/src/bin/server.sh
index dcc2a90f341..3e396a9089a 100755
--- a/modules/runtime/src/bin/server.sh
+++ b/modules/runtime/src/bin/server.sh
@@ -39,7 +39,7 @@ locateJava() {
 setupDefaults() {
     DEFAULT_JAVA_OPTS="-XX:-OmitStackTraceInFastThrow -XX:+AlwaysPreTouch"
     DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
-    CONSTANT_XP_OPTS=(-Dfile.encoding=UTF8 -Dnashorn.args="--no-deprecation-warning" -Dmapper.allow_dots_in_name=true --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED)
+    CONSTANT_XP_OPTS=(-Dfile.encoding=UTF8 -Dmapper.allow_dots_in_name=true --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED)
 }
 
 setupOptions() {