diff --git a/meshtastic/config.options b/meshtastic/config.options
index 9310cf0d..3f6d81c9 100644
--- a/meshtastic/config.options
+++ b/meshtastic/config.options
@@ -1,5 +1,7 @@
 # longest current is 45 chars, plan with a bit of buffer
 *DeviceConfig.tzdef max_size:65
+*DeviceConfig.buzzer_mode int_size:8
+
 
 *NetworkConfig.wifi_ssid max_size:33
 *NetworkConfig.wifi_psk max_size:65
diff --git a/meshtastic/config.proto b/meshtastic/config.proto
index c2a4df23..48b77f0a 100644
--- a/meshtastic/config.proto
+++ b/meshtastic/config.proto
@@ -150,6 +150,36 @@ message Config {
       CORE_PORTNUMS_ONLY = 5;
     }
 
+    /*
+     * Defines buzzer behavior for audio feedback
+     */
+    enum BuzzerMode {
+      /*
+       * Default behavior.
+       * Buzzer is enabled for all audio feedback including button presses and alerts.
+       */
+      ALL_ENABLED = 0;
+
+      /*
+       * Disabled.
+       * All buzzer audio feedback is disabled.
+       */
+      DISABLED = 1;
+
+      /*
+       * Notifications Only.
+       * Buzzer is enabled only for notifications and alerts, but not for button presses.
+       * External notification config determines the specifics of the notification behavior.
+       */
+      NOTIFICATIONS_ONLY = 2;
+
+      /*
+       * Non-notification system buzzer tones only.
+       * Buzzer is enabled only for non-notification tones such as button presses, startup, shutdown, but not for alerts.
+       */
+      SYSTEM_ONLY = 3;
+    }
+
     /*
      * Sets the role of node
      */
@@ -210,6 +240,12 @@ message Config {
      * If true, disable the default blinking LED (LED_PIN) behavior on the device
      */
     bool led_heartbeat_disabled = 12;
+
+    /*
+     * Controls buzzer behavior for audio feedback
+     * Defaults to ENABLED
+     */
+    BuzzerMode buzzer_mode = 13;
   }
 
   /*