diff --git a/src/dd.c b/src/dd.c
index 54ab14c..7aa729c 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -590,6 +590,11 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
                 g_config.fullscreen = FALSE;
             }
         }
+
+        if (g_config.maxgameticks == 0 && g_ddraw->mode.dmDisplayFrequency == 60)
+        {
+            g_config.maxgameticks == -2;
+        }
     }
 
     g_ddraw->render.width = g_config.window_rect.right;