diff --git a/utils/RUN_Server2.bat b/utils/RUN_Server2.bat
index bc61d8db08..1f0a460664 100644
--- a/utils/RUN_Server2.bat
+++ b/utils/RUN_Server2.bat
@@ -14,7 +14,7 @@
 
 :JBOSS
 @Set NOPAUSE=Yes
-@Set JAVA_OPTS=-server %ADEMPIERE_JAVA_OPTIONS% %SECURE%
+@Set JAVA_OPTS=-server %ADEMPIERE_JAVA_OPTIONS% %SECURE% -Dorg.adempiere.server.embedded=true
 
 @Echo Start Adempiere Apps Server %ADEMPIERE_HOME% (%ADEMPIERE_DB_NAME%)
 @Call %JBOSS_HOME%\bin\run -c adempiere -b %ADEMPIERE_APPS_SERVER%
diff --git a/utils/RUN_Server2.sh b/utils/RUN_Server2.sh
index 058f1f26ae..6b09e1cfae 100644
--- a/utils/RUN_Server2.sh
+++ b/utils/RUN_Server2.sh
@@ -15,7 +15,7 @@ fi
 SECURE=
 
 # headless option if you don't have X installed on the server
-JAVA_OPTS="-server $ADEMPIERE_JAVA_OPTIONS $SECURE -Djava.awt.headless=true"
+JAVA_OPTS="-server $ADEMPIERE_JAVA_OPTIONS $SECURE -Djava.awt.headless=true -Dorg.adempiere.server.embedded=true"
 
 export JAVA_OPTS