diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp
index eb4d0fe1..25b653eb 100644
--- a/desktop_version/src/main.cpp
+++ b/desktop_version/src/main.cpp
@@ -330,10 +330,14 @@ int main(int argc, char *argv[])
         {
             timesteplimit = 24;
         }
-        else
+        else if (game.gamestate == GAMEMODE || game.gamestate == MAPMODE || game.gamestate == TELEPORTERMODE)
         {
             timesteplimit = game.gameframerate;
         }
+        else
+        {
+            timesteplimit = 34;
+        }
 
         while (accumulator >= timesteplimit)
         {