diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp
index e7bec9ba7..4dc2373e3 100644
--- a/radio/src/gui/colorlcd/model_setup.cpp
+++ b/radio/src/gui/colorlcd/model_setup.cpp
@@ -567,6 +567,7 @@ class ModuleWindow : public FormGroup {
         channelStart->setMax(MAX_OUTPUT_CHANNELS - sentModuleChannels(moduleIdx) + 1);
       });
       channelEnd->enable(minModuleChannels(moduleIdx) < maxModuleChannels(moduleIdx));
+      if (channelEnd->getValue() > channelEnd->getMax()) channelEnd->setValue(channelEnd->getMax());
     }
 
     void update()