diff --git a/src/drv_system.c b/src/drv_system.c
index c25676f65e..fa98ed311e 100755
--- a/src/drv_system.c
+++ b/src/drv_system.c
@@ -6,10 +6,12 @@ static volatile uint32_t usTicks = 0;
 static volatile uint32_t sysTickUptime = 0;
 // from system_stm32f10x.c
 void SetSysClock(void);
+#ifdef BUZZER
 void systemBeep(bool onoff);
 static void beepRev4(bool onoff);
 static void beepRev5(bool onoff);
 void (* systemBeepPtr)(bool onoff) = NULL;
+#endif
 
 static void cycleCounterInit(void)
 {
@@ -92,16 +94,18 @@ void systemInit(void)
 #define AFIO_MAPR_SWJ_CFG_NO_JTAG_SW            (0x2 << 24)
     AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_NO_JTAG_SW;
 
+#ifdef BUZZER
     // Configure gpio
     // rev5 needs inverted beeper. oops.
     if (hse_value == 12000000)
         systemBeepPtr = beepRev5;
     else
         systemBeepPtr = beepRev4;
-
+    BEEP_OFF;
+#endif
+    
     LED0_OFF;
     LED1_OFF;
-    BEEP_OFF;
 
     for (i = 0; i < gpio_count; i++) {
         if (hse_value == 12000000 && gpio_setup[i].cfg.mode == Mode_Out_OD)
@@ -192,6 +196,8 @@ void systemReset(bool toBootloader)
     // Generate system reset
     SCB->AIRCR = AIRCR_VECTKEY_MASK | (uint32_t)0x04;
 }
+
+#ifdef BUZZER
 static void beepRev4(bool onoff)
 {
     if (onoff) {
@@ -209,10 +215,13 @@ static void beepRev5(bool onoff)
         digitalLo(BEEP_GPIO, BEEP_PIN);
     }
 }
+#endif
 
 void systemBeep(bool onoff)
 {
+#ifdef BUZZER
     systemBeepPtr(onoff);
+#endif
 }
 
 void alignSensors(int16_t *src, int16_t *dest, uint8_t rotation)