diff --git a/src/ButtonThread.h b/src/ButtonThread.h
index 5f68aa5b6..7138d3b6a 100644
--- a/src/ButtonThread.h
+++ b/src/ButtonThread.h
@@ -138,6 +138,7 @@ class ButtonThread : public concurrency::OSThread
 #ifdef BUTTON_PIN
         if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) !=
              moduleConfig.canned_message.inputbroker_pin_press) ||
+            !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
             !moduleConfig.canned_message.enabled) {
             powerFSM.trigger(EVENT_PRESS);
         }
@@ -232,4 +233,4 @@ class ButtonThread : public concurrency::OSThread
     }
 };
 
-} // namespace concurrency
+} // namespace concurrency
\ No newline at end of file