diff --git a/src/audio.cpp b/src/audio.cpp
index 0b229454c..c627da68e 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -178,14 +178,14 @@ void audioQueue::heartbeat()
         case 0:
           //stock beeper. simply turn port on for x time!
           if (toneTimeLeft > 0) {
-#if defined (PCBV4)
-            TCCR0A &= ~(0b01<<COM0A0);
+#if defined(PCBV4)
+            TCCR0A |= (0b01<<COM0A0);  // tone on
 #else
             PORTE |= (1 << OUT_E_BUZZER); // speaker output 'high'
 #endif
           }
           else {
-#if defined (PCVV4)
+#if defined(PCBV4)
             TCCR0A &= ~(0b01<<COM0A0);
 #else
             PORTE &= ~(1 << OUT_E_BUZZER); // speaker output 'low'
@@ -202,15 +202,14 @@ void audioQueue::heartbeat()
           if (toneTimeLeft > 0) {
             toneCounter += toneFreq;
             if ((toneCounter & 0x80) == 0x80) {
-#if defined (PCBV4)
-              TCCR0A &= ~(0b01<<COM0A0);
+#if defined(PCBV4)
+              TCCR0A |= (0b01<<COM0A0);  // tone on
 #else
               PORTE |= (1 << OUT_E_BUZZER); // speaker output 'high'
 #endif
-
             }
             else {
-#if defined (PCVV3)
+#if defined(PCBV4)
               TCCR0A &= ~(0b01<<COM0A0);
 #else
               PORTE &= ~(1 << OUT_E_BUZZER); // speaker output 'low'
@@ -218,7 +217,7 @@ void audioQueue::heartbeat()
             }
           }
           else {
-#if defined (PCVV3)
+#if defined(PCBV4)
             TCCR0A &= ~(0b01<<COM0A0);
 #else
             PORTE &= ~(1 << OUT_E_BUZZER); // speaker output 'low'
@@ -256,7 +255,11 @@ void audioQueue::heartbeat()
 
   }
   else {
+#if defined(PCBV4)
+    TCCR0A &= ~(0b01<<COM0A0);
+#else
     PORTE &= ~(1 << OUT_E_BUZZER); // speaker output 'low'
+#endif
     HAPTIC_OFF;
   }
 
diff --git a/src/beeper.h b/src/beeper.h
index c6f29ae10..47649f512 100644
--- a/src/beeper.h
+++ b/src/beeper.h
@@ -79,13 +79,27 @@ inline void AUDIO_HEARTBEAT()
     if (beepOn) {
       static bool warbleC;
       warbleC = warble && !warbleC;
-      if (warbleC)
-        PORTE &= ~(1<<OUT_E_BUZZER);//buzzer off
-      else
-        PORTE |=  (1<<OUT_E_BUZZER);//buzzer on
+      if (warbleC) {
+#if defined(PCBV4)
+        TCCR0A &= ~(0b01<<COM0A0);
+#else
+        PORTE &= ~(1 << OUT_E_BUZZER); // speaker output 'low'
+#endif
+      }
+      else {
+#if defined(PCBV4)
+        TCCR0A |= (0b01<<COM0A0);  // tone on
+#else
+        PORTE |= (1 << OUT_E_BUZZER); // speaker output 'high'
+#endif
+      }
     }
     else {
-      PORTE &= ~(1<<OUT_E_BUZZER);
+#if defined(PCBV4)
+      TCCR0A &= ~(0b01<<COM0A0);
+#else
+      PORTE &= ~(1 << OUT_E_BUZZER); // speaker output 'low'
+#endif
     }
 }
 
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 037fb4fef..93de4deb9 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -51,11 +51,6 @@ uint16_t g_timeMain;
 uint16_t g_time_per10;
 #endif
 
-#if defined (PCBSTD) && defined (AUDIO)
-uint8_t toneFreq = BEEP_DEFAULT_FREQ;
-uint8_t toneOn = false;
-#endif
-
 #ifdef AUDIO
 //new audio object
 audioQueue  audio;