diff --git a/libraries/AP_Notify/ToneAlarm_Linux.cpp b/libraries/AP_Notify/ToneAlarm_Linux.cpp
index e475d33014..394bd77135 100644
--- a/libraries/AP_Notify/ToneAlarm_Linux.cpp
+++ b/libraries/AP_Notify/ToneAlarm_Linux.cpp
@@ -66,6 +66,11 @@ void ToneAlarm_Linux::update()
         return;
     }
 
+    // exit if buzzer is not enabled
+    if (pNotify->buzzer_enabled() == false) {
+        return;
+    }
+
     // check for arming failure
     if (AP_Notify::events.arming_failed) {
         play_tune(TONE_ARMING_FAILURE_TUNE);