diff --git a/entrypoint.sh b/entrypoint.sh
index aecf710..3a3373b 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -102,7 +102,7 @@ function check() {
 # Compile server arguments
 function compile_args() {
   echo ":: Compiling server arguments"
-  export "ARGS=--nogui --add-modules=jdk.incubator.vector"
+  export "ARGS=--nogui"
   case "${MCSD_ENFORCE_FRESH_CACHES}" in
     "true")
       export "ARGS=${ARGS} --eraseCache"
@@ -156,6 +156,9 @@ function compile_flags() {
       internal_error "\$MCSD_GARBAGECOLLECTOR has invalid value"
       ;;
   esac
+  if [ "${MCSD_JAVA_VERSION}" == "17" ]; then
+	export "FLAGS=${FLAGS} --add-modules=jdk.incubator.vector"
+  fi
 }
 
 print_banner