From 5c1d65a9067e000edc29aa41f656132d4c908e25 Mon Sep 17 00:00:00 2001
From: Rajparikh18 <parikhraj85@gmail.com>
Date: Thu, 18 Jun 2026 00:06:04 +0530
Subject: [PATCH 1/2] fix(settings): prevent fps input from resetting
 (@Rajparikh18)

---
 .../pages/settings/custom-setting/AnimationFpsLimit.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/ts/components/pages/settings/custom-setting/AnimationFpsLimit.tsx b/frontend/src/ts/components/pages/settings/custom-setting/AnimationFpsLimit.tsx
index c7ad5b19eba3..97949fe8a6ae 100644
--- a/frontend/src/ts/components/pages/settings/custom-setting/AnimationFpsLimit.tsx
+++ b/frontend/src/ts/components/pages/settings/custom-setting/AnimationFpsLimit.tsx
@@ -13,7 +13,7 @@ export function AnimationFpsLimit(): JSXElement {
   const savedIndicator = useSavedIndicator();
   const form = createForm(() => ({
     defaultValues: {
-      fpsLimit: "",
+      fpsLimit: String(getfpsLimit()),
     },
     onSubmit: ({ value }) => {
       const val = parseFloat(String(value.fpsLimit));

From 07276358bddf4f122b940385d61c43f424570a10 Mon Sep 17 00:00:00 2001
From: Rajparikh18 <parikhraj85@gmail.com>
Date: Thu, 18 Jun 2026 12:47:47 +0530
Subject: [PATCH 2/2] fix(settings): handle native fps mode correctly
 (@Rajparikh18)

---
 .../pages/settings/custom-setting/AnimationFpsLimit.tsx      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/ts/components/pages/settings/custom-setting/AnimationFpsLimit.tsx b/frontend/src/ts/components/pages/settings/custom-setting/AnimationFpsLimit.tsx
index 97949fe8a6ae..d1e15bac638b 100644
--- a/frontend/src/ts/components/pages/settings/custom-setting/AnimationFpsLimit.tsx
+++ b/frontend/src/ts/components/pages/settings/custom-setting/AnimationFpsLimit.tsx
@@ -13,7 +13,7 @@ export function AnimationFpsLimit(): JSXElement {
   const savedIndicator = useSavedIndicator();
   const form = createForm(() => ({
     defaultValues: {
-      fpsLimit: String(getfpsLimit()),
+      fpsLimit: getfpsLimit() === 1000 ? "" : String(getfpsLimit()),
     },
     onSubmit: ({ value }) => {
       const val = parseFloat(String(value.fpsLimit));
@@ -54,6 +54,9 @@ export function AnimationFpsLimit(): JSXElement {
               name="fpsLimit"
               validators={{
                 onChange: ({ value }) => {
+                  if (value === "") {
+                    return;
+                  }
                   const val = parseFloat(String(value));
                   if (isNaN(val)) {
                     return "Must be a number";