diff --git a/Source/Glitch64/main.cpp b/Source/Glitch64/main.cpp
index 5ce238aa4..a3bfaa9ef 100644
--- a/Source/Glitch64/main.cpp
+++ b/Source/Glitch64/main.cpp
@@ -2115,6 +2115,10 @@ grBufferSwap( FxU32 swap_interval )
   for (i = 0; i < nb_fb; i++)
     fbs[i].buff_clear = 1;
 
+#ifdef _DEBUG
+  grFinish();
+#endif
+
   // VP debugging
 #ifdef VPDEBUG
   dump_stop();