diff --git a/glfw/wl_window.c b/glfw/wl_window.c
index cb3f688f4..6abb77d17 100644
--- a/glfw/wl_window.c
+++ b/glfw/wl_window.c
@@ -1509,7 +1509,7 @@ int _glfwPlatformCreateWindow(
     // and only then create the OpenGL context.
     if (window->wl.visible) loop_till_window_fully_created(window);
     debug("Creating OpenGL context and attaching it to window\n");
-    if (ctxconfig->client != GLFW_NO_API) attach_opengl_context_to_window(window, ctxconfig, fbconfig);
+    if (ctxconfig->client != GLFW_NO_API && !attach_opengl_context_to_window(window, ctxconfig, fbconfig)) return false;
     return true;
 }