diff --git a/src/window.c b/src/window.c
index 43b90b27..22e1e864 100644
--- a/src/window.c
+++ b/src/window.c
@@ -868,6 +868,12 @@ GLFWAPI void glfwSwapInterval(int interval)
         return;
     }
 
+    if (!_glfwLibrary.currentWindow)
+    {
+        _glfwSetError(GLFW_NO_CURRENT_WINDOW);
+        return;
+    }
+
     _glfwPlatformSwapInterval(interval);
 }