diff --git a/src/board_ersky9x.cpp b/src/board_ersky9x.cpp
index 04a816088..4d86b37c4 100644
--- a/src/board_ersky9x.cpp
+++ b/src/board_ersky9x.cpp
@@ -419,6 +419,7 @@ extern "C" void TC2_IRQHandler()
   dummy = TC0->TC_CHANNEL[2].TC_SR;
   (void) dummy ;          // Discard value - prevents compiler warning
 
+  HAPTIC_HEARTBEAT();
   AUDIO_HEARTBEAT();
 
   if ( ++pre_scale >= 2 ) {
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 0fe61ef80..ae16acd7c 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -2116,12 +2116,6 @@ void perMain()
       }
       break;
   }
-
-#if defined(PCBARM)
-  HAPTIC_HEARTBEAT();
-  // AUDIO_HEARTBEAT();  // the queue processing
-#endif
-
 }
 int16_t g_ppmIns[8];
 uint8_t ppmInState = 0; //0=unsync 1..8= wait for value i-1