diff --git a/deploy/scripts/run-server.bat b/deploy/scripts/run-server.bat
index 034d71b439..f7c0a2519f 100644
--- a/deploy/scripts/run-server.bat
+++ b/deploy/scripts/run-server.bat
@@ -4,8 +4,10 @@ for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do
 echo "Starting Cloudbeaver Server"
 
 IF NOT EXIST workspace\.metadata (
-    mkdir workspace\GlobalConfiguration\.dbeaver\
-    copy conf\initial-data-sources.conf workspace\GlobalConfiguration\.dbeaver\data-sources.json
+    IF NOT EXIST workspace\GlobalConfiguration\.dbeaver (
+        mkdir workspace\GlobalConfiguration\.dbeaver\
+        copy conf\initial-data-sources.conf workspace\GlobalConfiguration\.dbeaver\data-sources.json
+    )
 )
 
 java %JAVA_OPTS% --add-modules=ALL-SYSTEM --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.action=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED -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 f66daa1fe9..a21f684e9d 100755
--- a/deploy/scripts/run-server.sh
+++ b/deploy/scripts/run-server.sh
@@ -4,6 +4,6 @@ launcherJar=( server/plugins/org.eclipse.equinox.launcher*.jar )
 
 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
+[ ! -d "workspace/.metadata" ] && mkdir -p workspace/.metadata && mkdir -p workspace/GlobalConfiguration/.dbeaver && [ ! -f "workspace/GlobalConfiguration/.dbeaver/data-sources.json" ] && cp conf/initial-data-sources.conf workspace/GlobalConfiguration/.dbeaver/data-sources.json
 
 java ${JAVA_OPTS} --add-modules=ALL-SYSTEM --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.action=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED -jar  ${launcherJar} -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage