diff --git a/src/SFML/Window/Window.cpp b/src/SFML/Window/Window.cpp
index a2f71c75..6fd7cb6b 100644
--- a/src/SFML/Window/Window.cpp
+++ b/src/SFML/Window/Window.cpp
@@ -392,6 +392,7 @@ void Window::initialize()
     setMouseCursorVisible(true);
     setVerticalSyncEnabled(false);
     setKeyRepeatEnabled(true);
+    setFramerateLimit(0);
 
     // Get and cache the initial size of the window
     m_size = m_impl->getSize();