diff --git a/scripts/rabbitmq-diagnostics.bat b/scripts/rabbitmq-diagnostics.bat
index 311cfa3f5e..9ab60c5a9e 100644
--- a/scripts/rabbitmq-diagnostics.bat
+++ b/scripts/rabbitmq-diagnostics.bat
@@ -58,5 +58,9 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 -escript main rabbitmqctl_escript ^
 -extra "%RABBITMQ_HOME%\escript\rabbitmq-diagnostics" !STAR!
 
+if ERRORLEVEL 1 (
+    exit /B 1
+)
+
 endlocal
 endlocal