diff --git a/src/config.c b/src/config.c
index cfeb556..443ff76 100644
--- a/src/config.c
+++ b/src/config.c
@@ -476,6 +476,8 @@ static void cfg_create_ini()
             "renderer=opengl\n"
             "nonexclusive=true\n"
             "maxgameticks=25\n"
+            "maxfps=25\n"
+            "forcefps=true\n"
             "\n"
             "; Twisted Metal 2\n"
             "[Tm2]\n"
diff --git a/src/render_gdi.c b/src/render_gdi.c
index de77e8f..e1c96b7 100644
--- a/src/render_gdi.c
+++ b/src/render_gdi.c
@@ -50,7 +50,7 @@ DWORD WINAPI gdi_render_main(void)
     }
 
     while (g_ddraw->render.run &&
-        (g_ddraw->render.forcefps || WaitForSingleObject(g_ddraw->render.sem, 200) != WAIT_FAILED))
+        (g_ddraw->render.forcefps || WaitForSingleObject(g_ddraw->render.sem, INFINITE) != WAIT_FAILED))
     {
 #if _DEBUG
         dbg_draw_frame_info_start();
diff --git a/src/render_ogl.c b/src/render_ogl.c
index 77e20bd..188d0f4 100644
--- a/src/render_ogl.c
+++ b/src/render_ogl.c
@@ -548,7 +548,7 @@ static void ogl_render()
     }
 
     while (g_ogl.use_opengl && g_ddraw->render.run &&
-        (g_ddraw->render.forcefps || WaitForSingleObject(g_ddraw->render.sem, 200) != WAIT_FAILED))
+        (g_ddraw->render.forcefps || WaitForSingleObject(g_ddraw->render.sem, INFINITE) != WAIT_FAILED))
     {
 #if _DEBUG
         dbg_draw_frame_info_start();