diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index d00fbbff..9f20398a 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -1104,10 +1104,6 @@ void _glfwPlatformRefreshWindowParams(void)
                            forAttribute:NSOpenGLPFASamples
                        forVirtualScreen:0];
     window->samples = value;
-
-    // These this is forced to false as long as Mac OS X lacks support for
-    // requesting debug contexts
-    window->glDebug = GL_FALSE;
 }
 
 
diff --git a/src/opengl.c b/src/opengl.c
index 67b5e728..64e12e97 100644
--- a/src/opengl.c
+++ b/src/opengl.c
@@ -366,6 +366,8 @@ GLboolean _glfwIsValidContext(_GLFWwindow* window, _GLFWwndconfig* wndconfig)
 
           if (flags & GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT)
               window->glForward = GL_TRUE;
+          if (flags & 0)
+              window->glDebug = GL_TRUE;
       }
     }