diff --git a/src/modules/core/components/settings/NumberSetting.tsx b/src/modules/core/components/settings/NumberSetting.tsx
index 65e1b17c..d0cc304c 100644
--- a/src/modules/core/components/settings/NumberSetting.tsx
+++ b/src/modules/core/components/settings/NumberSetting.tsx
@@ -170,7 +170,10 @@ export const NumberSetting = ({
                         type="number"
                         onChange={(e) => {
                             const newValue = Number(e.target.value);
-                            updateValue(newValue, false);
+                            const newValueMinLimit = Math.min(newValue, maxValue ?? newValue);
+                            const newValueMaxLimit = Math.max(newValueMinLimit, minValue ?? newValueMinLimit);
+
+                            updateValue(newValueMaxLimit, false);
                         }}
                         slotProps={{
                             input: {