diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp
index 2354e54cb..5631ff8a4 100644
--- a/renderdoc/driver/gl/gl_replay.cpp
+++ b/renderdoc/driver/gl/gl_replay.cpp
@@ -3367,6 +3367,10 @@ void GLReplay::MakeCurrentReplayContext(GLWindowingData *ctx)
 
   if(ctx && ctx != prev)
   {
+#if ENABLED(RDOC_APPLE)
+    GL.glFinish();
+#endif
+
     m_pDriver->m_Platform.MakeContextCurrent(*ctx);
     prev = ctx;
     m_pDriver->ActivateContext(*ctx);