diff --git a/Bloxstrap/FastFlagManager.cs b/Bloxstrap/FastFlagManager.cs
index 99b1f5db..2b5f3146 100644
--- a/Bloxstrap/FastFlagManager.cs
+++ b/Bloxstrap/FastFlagManager.cs
@@ -245,23 +245,6 @@ public override void Load()
             string? val = GetPreset("UI.Menu.Style.EnableV4.1");
             if (GetPreset("UI.Menu.Style.EnableV4.2") != val)
                 SetPreset("UI.Menu.Style.EnableV4.2", val);
-
-            if (GetPreset("Rendering.Framerate") is not null)
-                return;
-
-            // set it to be the framerate of the primary display by default
-
-            var screen = Screen.AllScreens.Where(x => x.Primary).Single();
-            var devmode = new DEVMODEW();
-
-            PInvoke.EnumDisplaySettings(screen.DeviceName, ENUM_DISPLAY_SETTINGS_MODE.ENUM_CURRENT_SETTINGS, ref devmode);
-
-            uint framerate = devmode.dmDisplayFrequency;
-
-            if (framerate <= 100)
-                framerate *= 2;
-
-            SetPreset("Rendering.Framerate", framerate);
         }
     }
 }
diff --git a/Bloxstrap/InstallChecker.cs b/Bloxstrap/InstallChecker.cs
index 7b902ab2..583814a1 100644
--- a/Bloxstrap/InstallChecker.cs
+++ b/Bloxstrap/InstallChecker.cs
@@ -210,7 +210,7 @@ internal static void CheckUpgrade()
 
             // update migrations
 
-            if (App.BuildMetadata.CommitRef.StartsWith("tag"))
+            if (App.BuildMetadata.CommitRef.StartsWith("tag") && currentVersionInfo.ProductVersion is not null)
             {
                 if (existingVersionInfo.ProductVersion == "2.4.0")
                 { 
@@ -227,7 +227,7 @@ internal static void CheckUpgrade()
 
                     App.FastFlags.Save();
                 }
-                else if (currentVersionInfo.ProductVersion == "2.6.0")
+                else if (currentVersionInfo.ProductVersion.StartsWith("2.6.0"))
                 {
                     if (App.Settings.Prop.UseDisableAppPatch)
                     {
@@ -246,6 +246,13 @@ internal static void CheckUpgrade()
                     if (App.Settings.Prop.BootstrapperStyle == BootstrapperStyle.ClassicFluentDialog)
                         App.Settings.Prop.BootstrapperStyle = BootstrapperStyle.FluentDialog;
 
+                    _ = int.TryParse(App.FastFlags.GetPreset("Rendering.Framerate"), out int x);
+                    if (x == 0)
+                    {
+                        App.FastFlags.SetPreset("Rendering.Framerate", null);
+                        App.FastFlags.Save();
+                    }
+
                     App.Settings.Save();
                 }
             }
diff --git a/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
index 325fd0ef..3f1fd42e 100644
--- a/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
+++ b/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
@@ -64,8 +64,8 @@ public string StateOverlayFlags
 
         public int FramerateLimit
         {
-            get => int.TryParse(App.FastFlags.GetPreset("Rendering.Framerate"), out int x) ? x : 60;
-            set => App.FastFlags.SetPreset("Rendering.Framerate", value);
+            get => int.TryParse(App.FastFlags.GetPreset("Rendering.Framerate"), out int x) ? x : 0;
+            set => App.FastFlags.SetPreset("Rendering.Framerate", value == 0 ? null : value);
         }
 
         public IReadOnlyDictionary<RenderingMode, string> RenderingModes => FastFlagManager.RenderingModes;