diff --git a/src/external/glfw/src/egl_context.c b/src/external/glfw/src/egl_context.c
index bc5f3e600..88c47bbc0 100644
--- a/src/external/glfw/src/egl_context.c
+++ b/src/external/glfw/src/egl_context.c
@@ -279,7 +279,7 @@ static GLFWglproc getProcAddressEGL(const char* procname)
 {
     _GLFWwindow* window = _glfwPlatformGetTls(&_glfw.contextSlot);
 
-    if (window->context.egl.client)
+    if (window && window->context.egl.client)
     {
         GLFWglproc proc = (GLFWglproc)
             _glfwPlatformGetModuleSymbol(window->context.egl.client, procname);
diff --git a/src/external/glfw/src/glx_context.c b/src/external/glfw/src/glx_context.c
index 3c38807f3..30c737994 100644
--- a/src/external/glfw/src/glx_context.c
+++ b/src/external/glfw/src/glx_context.c
@@ -189,13 +189,14 @@ static void swapBuffersGLX(_GLFWwindow* window)
 
 static void swapIntervalGLX(int interval)
 {
-    _GLFWwindow* window = _glfwPlatformGetTls(&_glfw.contextSlot);
-
     if (_glfw.glx.EXT_swap_control)
     {
-        _glfw.glx.SwapIntervalEXT(_glfw.x11.display,
-                                  window->context.glx.window,
-                                  interval);
+        _GLFWwindow *window = _glfwPlatformGetTls(&_glfw.contextSlot);
+        if (window) {
+            _glfw.glx.SwapIntervalEXT(_glfw.x11.display,
+                                      window->context.glx.window,
+                                      interval);
+        }
     }
     else if (_glfw.glx.MESA_swap_control)
         _glfw.glx.SwapIntervalMESA(interval);