diff --git a/src/Windowing/Silk.NET.Windowing.Glfw/GlfwWindow.cs b/src/Windowing/Silk.NET.Windowing.Glfw/GlfwWindow.cs
index d6aca425df..c43e031698 100644
--- a/src/Windowing/Silk.NET.Windowing.Glfw/GlfwWindow.cs
+++ b/src/Windowing/Silk.NET.Windowing.Glfw/GlfwWindow.cs
@@ -115,7 +115,7 @@ protected override void CoreReset()
             }
         }
 
-        protected override IGLContext? CoreGLContext => _glContext ??= new(_glfw, _glfwWindow, this);
+        protected override IGLContext CoreGLContext => _glContext ??= new(_glfw, _glfwWindow, this);
 
         protected override IVkSurface? CoreVkSurface
         {
@@ -434,6 +434,8 @@ protected override void CoreInitialize(WindowOptions opts)
                 _glfw.MakeContextCurrent(_glfwWindow);
             }
 
+            CoreGLContext.SwapInterval(opts.VSync ? 1 : 0);
+
             GLFW.Glfw.ThrowExceptions();
         }