diff --git a/src/server.cpp b/src/server.cpp
index 8e9313464..0daa61054 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -3569,6 +3569,9 @@ void dedicated_server_loop(Server &server, bool &kill)
 		}
 		server.step(steplen);
 
+		if (server.getShutdownRequested() || kill)
+			break;
+
 		/*
 			Profiler
 		*/