diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index b92d217d4..b30cc2d50 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -3196,7 +3196,12 @@ void CClient::Run()
 
 		// update input
 		if(Input()->Update())
-			SetState(IClient::STATE_QUITTING); // SDL_QUIT
+		{
+			if(State() == IClient::STATE_QUITTING)
+				break;
+			else
+				SetState(IClient::STATE_QUITTING); // SDL_QUIT
+		}
 #if defined(CONF_AUTOUPDATE)
 		Updater()->Update();
 #endif