diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index bad5451de..09ee823d0 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -758,7 +758,9 @@ WrappedOpenGL::WrappedOpenGL(const char *logfile, const GLHookSet &funcs) : m_Re
     if(m_Real.glDebugMessageCallback)
     {
       m_Real.glDebugMessageCallback(&DebugSnoopStatic, this);
+#if !defined(RELEASE)
       m_Real.glEnable(eGL_DEBUG_OUTPUT_SYNCHRONOUS);
+#endif
     }
   }
   else
diff --git a/renderdoc/driver/gl/gl_replay_linux.cpp b/renderdoc/driver/gl/gl_replay_linux.cpp
index 0163cbf22..d5ff5b55b 100644
--- a/renderdoc/driver/gl/gl_replay_linux.cpp
+++ b/renderdoc/driver/gl/gl_replay_linux.cpp
@@ -152,7 +152,11 @@ uint64_t GLReplay::MakeOutputWindow(WindowingSystem system, void *data, bool dep
   attribs[i++] = GLX_CONTEXT_MINOR_VERSION_ARB;
   attribs[i++] = 3;
   attribs[i++] = GLX_CONTEXT_FLAGS_ARB;
+#if defined(_RELEASE)
+  attribs[i++] = 0;
+#else
   attribs[i++] = GLX_CONTEXT_DEBUG_BIT_ARB;
+#endif
   attribs[i++] = GLX_CONTEXT_PROFILE_MASK_ARB;
   attribs[i++] = GLX_CONTEXT_CORE_PROFILE_BIT_ARB;
 
@@ -302,7 +306,11 @@ ReplayCreateStatus GL_CreateReplayDevice(const char *logfile, IReplayDriver **dr
   attribs[i++] = GLX_CONTEXT_MINOR_VERSION_ARB;
   attribs[i++] = 3;
   attribs[i++] = GLX_CONTEXT_FLAGS_ARB;
+#if defined(_RELEASE)
+  attribs[i++] = 0;
+#else
   attribs[i++] = GLX_CONTEXT_DEBUG_BIT_ARB;
+#endif
   attribs[i++] = GLX_CONTEXT_PROFILE_MASK_ARB;
   attribs[i++] = GLX_CONTEXT_CORE_PROFILE_BIT_ARB;
 
diff --git a/renderdoc/driver/gl/gl_replay_win32.cpp b/renderdoc/driver/gl/gl_replay_win32.cpp
index b6d194d00..a06835c05 100644
--- a/renderdoc/driver/gl/gl_replay_win32.cpp
+++ b/renderdoc/driver/gl/gl_replay_win32.cpp
@@ -169,7 +169,11 @@ uint64_t GLReplay::MakeOutputWindow(WindowingSystem system, void *data, bool dep
   attribs[i++] = WGL_CONTEXT_MINOR_VERSION_ARB;
   attribs[i++] = 3;
   attribs[i++] = WGL_CONTEXT_FLAGS_ARB;
+#if defined(_RELEASE)
+  attribs[i++] = 0;
+#else
   attribs[i++] = WGL_CONTEXT_DEBUG_BIT_ARB;
+#endif
   attribs[i++] = WGL_CONTEXT_PROFILE_MASK_ARB;
   attribs[i++] = WGL_CONTEXT_CORE_PROFILE_BIT_ARB;
 
@@ -402,7 +406,11 @@ ReplayCreateStatus GL_CreateReplayDevice(const char *logfile, IReplayDriver **dr
   attribs[i++] = WGL_CONTEXT_MINOR_VERSION_ARB;
   attribs[i++] = 3;
   attribs[i++] = WGL_CONTEXT_FLAGS_ARB;
+#if defined(_RELEASE)
+  attribs[i++] = 0;
+#else
   attribs[i++] = WGL_CONTEXT_DEBUG_BIT_ARB;
+#endif
   attribs[i++] = WGL_CONTEXT_PROFILE_MASK_ARB;
   attribs[i++] = WGL_CONTEXT_CORE_PROFILE_BIT_ARB;