diff --git a/deploy/scripts/run-server.bat b/deploy/scripts/run-server.bat
index d8d8e3215a..e849085bb3 100644
--- a/deploy/scripts/run-server.bat
+++ b/deploy/scripts/run-server.bat
@@ -8,9 +8,4 @@ IF NOT EXIST workspace\.metadata (
     copy conf\initial-data-sources.conf workspace\GlobalConfiguration\.dbeaver\data-sources.json
 )
 
-SET VMARGS_OPTS = ""
-If Not Defined JAVA_OPTS (
-    SET VMARGS_OPTS = "-Xmx2048M"
-)
-
-java -jar %launcherJar% -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs %VMARGS_OPTS%
+java %JAVA_OPTS% -jar %launcherJar% -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage
diff --git a/deploy/scripts/run-server.sh b/deploy/scripts/run-server.sh
index f323d69a40..e34630e183 100755
--- a/deploy/scripts/run-server.sh
+++ b/deploy/scripts/run-server.sh
@@ -6,6 +6,4 @@ echo "Starting Cloudbeaver Server"
 
 [ ! -d "workspace/.metadata" ] && mkdir -p workspace/.metadata && mkdir -p workspace/GlobalConfiguration/.dbeaver && cp conf/initial-data-sources.conf workspace/GlobalConfiguration/.dbeaver/data-sources.json
 
-VMARGS_OPTS="${JAVA_OPTS:--Xmx2048M}"
-
-java -jar ${launcherJar} -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs ${VMARGS_OPTS}
+java ${JAVA_OPTS} -jar ${launcherJar} -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage