Index: source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
===================================================================
--- source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
+++ source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
@@ -116,9 +116,7 @@
 	InitGraphics(g_AtlasGameLoop->args, g_InitFlags, {});
 
 #if OS_WIN
-	// HACK (to stop things looking very ugly when scrolling) - should
-	// use proper config system.
-	if(ogl_HaveExtension("WGL_EXT_swap_control"))
+	if(g_VideoMode.IsVSyncEnabled() && ogl_HaveExtension("WGL_EXT_swap_control"))
 		pwglSwapIntervalEXT(1);
 #endif
 }