diff --git a/companion/src/modeledit/channels.cpp b/companion/src/modeledit/channels.cpp
index 27b588dfd..fdb6aa7a9 100644
--- a/companion/src/modeledit/channels.cpp
+++ b/companion/src/modeledit/channels.cpp
@@ -196,6 +196,10 @@ void Channels::refreshExtendedLimits()
     
     minDSB->setMinimum(-model.getChannelsMax());
     maxDSB->setMaximum(model.getChannelsMax());
+
+    //reset any limit that is bigger than current maximum (dependent on extended limits setting)
+    if ( model.limitData[i].min < -model.getChannelsMax() ) model.limitData[i].min = -model.getChannelsMax();
+    if ( model.limitData[i].max > +model.getChannelsMax() ) model.limitData[i].max = +model.getChannelsMax();
   }
   emit modified(); 
 }