diff --git a/src/video/null_v.cpp b/src/video/null_v.cpp
index e3a032d71f..0ca0057762 100644
--- a/src/video/null_v.cpp
+++ b/src/video/null_v.cpp
@@ -50,8 +50,11 @@ void VideoDriver_Null::MainLoop()
 {
 	uint i;
 
-	for (i = 0; i < this->ticks; i++) {
-		::GameLoop();
+	for (i = 0; i < this->ticks && ! _exit_game; i++) {
+		{
+			std::lock_guard<std::mutex> lock(this->game_state_mutex);
+			::GameLoop();
+		}
 		::InputLoop();
 		::UpdateWindows();
 	}