diff --git a/libs/video/renderer/gl/gl_rmisc.c b/libs/video/renderer/gl/gl_rmisc.c
index 3e86f0ac7..e6ed47e19 100644
--- a/libs/video/renderer/gl/gl_rmisc.c
+++ b/libs/video/renderer/gl/gl_rmisc.c
@@ -221,7 +221,6 @@ R_TimeRefresh_f (void)
 	double      start, stop, time;
 	int         i;
 
-	qfglFinish ();
 	GL_EndRendering ();
 
 	start = Sys_DoubleTime ();
@@ -229,7 +228,6 @@ R_TimeRefresh_f (void)
 		GL_BeginRendering (&glx, &gly, &glwidth, &glheight);
 		r_refdef.viewangles[1] = i * (360.0 / 128.0);
 		R_RenderView ();
-		qfglFinish ();
 		GL_EndRendering ();
 	}
 
diff --git a/libs/video/renderer/gl/gl_screen.c b/libs/video/renderer/gl/gl_screen.c
index 664d762c3..2ae47b826 100644
--- a/libs/video/renderer/gl/gl_screen.c
+++ b/libs/video/renderer/gl/gl_screen.c
@@ -766,6 +766,8 @@ SCR_UpdateScreen (double realtime, SCR_Func *scr_funcs)
 	if (block_drawing)
 		return;
 
+	GL_EndRendering ();
+
 	r_realtime = realtime;
 
 	vid.numpages = 2 + gl_triplebuffer->int_val;
@@ -855,6 +857,5 @@ SCR_UpdateScreen (double realtime, SCR_Func *scr_funcs)
 					c_alias_polys);
 	}
 
-	qfglFinish ();
-	GL_EndRendering ();
+	qfglFlush ();
 }
diff --git a/libs/video/targets/vid_3dfxsvga.c b/libs/video/targets/vid_3dfxsvga.c
index 86f3a521e..439f63008 100644
--- a/libs/video/targets/vid_3dfxsvga.c
+++ b/libs/video/targets/vid_3dfxsvga.c
@@ -155,7 +155,7 @@ GL_Init (void)
 void
 GL_EndRendering (void)
 {
-	qfglFlush ();
+	qfglFinish ();
 	qf_fxMesaSwapBuffers ();
 	Sbar_Changed ();
 }
diff --git a/libs/video/targets/vid_glx.c b/libs/video/targets/vid_glx.c
index afda60f93..e8da3b86e 100644
--- a/libs/video/targets/vid_glx.c
+++ b/libs/video/targets/vid_glx.c
@@ -112,7 +112,7 @@ GL_Init (void)
 void
 GL_EndRendering (void)
 {
-	qfglFlush ();
+	qfglFinish ();
 	qfglXSwapBuffers (x_disp, x_win);
 	Sbar_Changed ();
 }
diff --git a/libs/video/targets/vid_sgl.c b/libs/video/targets/vid_sgl.c
index 333c7beca..cd700d220 100644
--- a/libs/video/targets/vid_sgl.c
+++ b/libs/video/targets/vid_sgl.c
@@ -120,7 +120,7 @@ GL_Init (void)
 void
 GL_EndRendering (void)
 {
-	qfglFlush ();
+	qfglFinish ();
 	SDL_GL_SwapBuffers ();
 	Sbar_Changed ();
 }
diff --git a/libs/video/targets/vid_wgl.c b/libs/video/targets/vid_wgl.c
index ab3749c2d..9ade862a8 100644
--- a/libs/video/targets/vid_wgl.c
+++ b/libs/video/targets/vid_wgl.c
@@ -445,8 +445,10 @@ GL_Init (void)
 void
 GL_EndRendering (void)
 {
-	if (!scr_skipupdate || block_drawing)
+	if (!scr_skipupdate || block_drawing) {
+		qfglFinish ();
 		SwapBuffers (maindc);
+	}
 
 	// handle the mouse state when windowed if that's changed
 	if (modestate == MS_WINDOWED) {