diff --git a/internal/ui/ui_glfw.go b/internal/ui/ui_glfw.go
index cd5cf45f5..c5bf9a384 100644
--- a/internal/ui/ui_glfw.go
+++ b/internal/ui/ui_glfw.go
@@ -773,7 +773,13 @@ func (u *userInterfaceImpl) registerWindowSetSizeCallback() {
 			}
 
 			if u.graphicsDriver.IsGL() {
+				glfw.SwapInterval(0)
 				u.swapBuffers()
+				if u.fpsMode == FPSModeVsyncOn {
+					glfw.SwapInterval(1)
+				} else {
+					glfw.SwapInterval(0)
+				}
 			}
 
 			u.forceToRefreshIfNeeded()