3 files changed, 11 insertions, 16 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 232a8755c3..0c97aaa014 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -39,6 +39,17 @@ if exist "!RABBITMQ_CONF_ENV_FILE!" (
     call "!RABBITMQ_CONF_ENV_FILE!"
 )
 
+rem Bump ETS table limit to 50000
+if "!ERL_MAX_ETS_TABLES!"=="" (
+    set ERL_MAX_ETS_TABLES=50000
+)
+
+rem Default is defined here:
+rem https://github.com/erlang/otp/blob/master/erts/emulator/beam/erl_port.h
+if "!ERL_MAX_PORTS!"=="" (
+    set ERL_MAX_PORTS=65536
+)
+
 set DEFAULT_SCHEDULER_BIND_TYPE=db
 if "!RABBITMQ_SCHEDULER_BIND_TYPE!"=="" (
     set RABBITMQ_SCHEDULER_BIND_TYPE=!SCHEDULER_BIND_TYPE!
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index f19b880706..7d4d1b486f 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -215,17 +215,6 @@ if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" (
     set RABBITMQ_IO_THREAD_POOL_SIZE=64
 )
 
-rem Bump ETS table limit to 50000
-if "!ERL_MAX_ETS_TABLES!"=="" (
-    set ERL_MAX_ETS_TABLES=50000
-)
-
-rem Default is defined here:
-rem https://github.com/erlang/otp/blob/master/erts/emulator/beam/erl_port.h
-if "!ERL_MAX_PORTS!"=="" (
-    set ERL_MAX_PORTS=8192
-)
-
 set ENV_OK=true
 CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE!
 CALL :check_not_empty "RABBITMQ_NAME_TYPE" !RABBITMQ_NAME_TYPE!
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index f9570fe3cc..fe9884abf0 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -301,11 +301,6 @@ if "!RABBITMQ_SERVICE_RESTART!"=="" (
     set RABBITMQ_SERVICE_RESTART=restart
 )
 
-rem Bump ETS table limit to 50000
-if "!ERL_MAX_ETS_TABLES!"=="" (
-    set ERL_MAX_ETS_TABLES=50000
-)
-
 set ERLANG_SERVICE_ARGUMENTS= ^
 -pa "!RABBITMQ_EBIN_ROOT:\=/!" ^
 -boot start_sasl ^