diff --git a/src/eez/modules/psu/channel_dispatcher.cpp b/src/eez/modules/psu/channel_dispatcher.cpp
index 84ac2093a..40a3f7a2c 100644
--- a/src/eez/modules/psu/channel_dispatcher.cpp
+++ b/src/eez/modules/psu/channel_dispatcher.cpp
@@ -1124,7 +1124,7 @@ bool outputEnable(Channel &channel, bool enable, int *err) {
                 return false;
             }
 
-            if (triggerModeEnabled) {
+            if (triggerModeEnabled && !trigger::isIdle()) {
                 trigger::abort();
             } else {
                 channel_dispatcher::outputEnable(channel, false);