diff --git a/src/kiwano/platform/Runner.cpp b/src/kiwano/platform/Runner.cpp
index 90099f3a..737e294b 100644
--- a/src/kiwano/platform/Runner.cpp
+++ b/src/kiwano/platform/Runner.cpp
@@ -103,7 +103,10 @@ void Runner::InitSettings()
     }
 
     // Create frame ticker
-    frame_ticker_ = Ticker::Create(settings_.frame_interval, -1);
+    if (!settings_.frame_interval.IsZero())
+    {
+        frame_ticker_ = Ticker::Create(settings_.frame_interval, -1);
+    }
 }
 
 bool Runner::MainLoop(Duration dt)
diff --git a/src/kiwano/platform/Runner.h b/src/kiwano/platform/Runner.h
index 9e7c2f0d..7240c573 100644
--- a/src/kiwano/platform/Runner.h
+++ b/src/kiwano/platform/Runner.h
@@ -59,8 +59,8 @@ struct Settings
         , resizable(false)
         , fullscreen(false)
         , bg_color(Color::Black)
-        , frame_interval(16)
-        , vsync_enabled(false)
+        , frame_interval(0)
+        , vsync_enabled(true)
         , debug_mode(false)
     {
     }