diff --git a/companion/src/generaledit/generalsetup.ui b/companion/src/generaledit/generalsetup.ui
index a600ef1e8..748e28208 100644
--- a/companion/src/generaledit/generalsetup.ui
+++ b/companion/src/generaledit/generalsetup.ui
@@ -1358,7 +1358,7 @@ p, li { white-space: pre-wrap; }
         <number>0</number>
        </property>
        <property name="maximum">
-        <number>300</number>
+        <number>1000</number>
        </property>
        <property name="singleStep">
         <number>10</number>
diff --git a/radio/src/gui/Taranis/menu_general_setup.cpp b/radio/src/gui/Taranis/menu_general_setup.cpp
index e94242c29..da2c48466 100755
--- a/radio/src/gui/Taranis/menu_general_setup.cpp
+++ b/radio/src/gui/Taranis/menu_general_setup.cpp
@@ -477,7 +477,7 @@ void menuGeneralSetup(uint8_t event)
         lcd_putsLeft(y, STR_SWITCHES_DELAY);
         lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, 10*SWITCHES_DELAY(), attr|LEFT);
         lcd_putsAtt(lcdLastPos, y, STR_MS, attr);
-        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchesDelay, -15, +15);
+        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchesDelay, -15, 100-15);
         break;
 
       case ITEM_SETUP_RX_CHANNEL_ORD: