diff --git a/src/modules/ExternalNotificationModule.cpp b/src/modules/ExternalNotificationModule.cpp
index 652db04d3d..3e6c7d9510 100644
--- a/src/modules/ExternalNotificationModule.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@@ -177,7 +177,7 @@ int32_t ExternalNotificationModule::runOnce()
         }
 #endif
         // now let the PWM buzzer play
-        if (moduleConfig.external_notification.use_pwm) {
+        if (moduleConfig.external_notification.use_pwm && config.device.buzzer_gpio) {
             if (rtttl::isPlaying()) {
                 rtttl::play();
             } else if (isNagging && (nagCycleCutoff >= millis())) {
diff --git a/src/modules/ExternalNotificationModule.h b/src/modules/ExternalNotificationModule.h
index 08e72c35a9..ed1ebae8b9 100644
--- a/src/modules/ExternalNotificationModule.h
+++ b/src/modules/ExternalNotificationModule.h
@@ -32,7 +32,7 @@ class ExternalNotificationModule : public SinglePortModule, private concurrency:
   public:
     ExternalNotificationModule();
 
-    uint32_t nagCycleCutoff = UINT32_MAX;
+    uint32_t nagCycleCutoff = 1;
 
     void setExternalOn(uint8_t index = 0);
     void setExternalOff(uint8_t index = 0);