diff --git a/src/audio.cpp b/src/audio.cpp
index 5dd7dc49a..278d55ff7 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -145,7 +145,7 @@ void audioQueue::playASAP(uint8_t tFreq, uint8_t tLen, uint8_t tPause,
     queueToneFreq[t_queueWidx] = ((s_beeper && tFreq) ? tFreq + g_eeGeneral.speakerPitch + BEEP_OFFSET : 0); // add pitch compensator
     queueToneLength[t_queueWidx] = getToneLength(tLen);
     queueTonePause[t_queueWidx] = tPause;
-    queueToneRepeat[t_queueWidx] = tRepeat;
+    queueToneRepeat[t_queueWidx] = tRepeat -1;
     queueToneFreqIncr[t_queueWidx] = tFreqIncr;
     t_queueWidx = next_queueWidx;
   }
diff --git a/src/haptic.h b/src/haptic.h
index 6be7fed3a..1148d1953 100644
--- a/src/haptic.h
+++ b/src/haptic.h
@@ -94,8 +94,14 @@ inline void hapticAudioEvent(uint8_t e)
 {
   if (g_eeGeneral.hapticMode>=-1 && e<=AU_ERROR)
     hapticDefevent(1);
+  else if (e == AU_TIMER_30)
+    hapticDefevent(3);
+  else if (e == AU_TIMER_20)
+    hapticDefevent(2);   
+  else if (e == AU_TIMER_10)
+    hapticDefevent(1);   
   else if (g_eeGeneral.hapticMode==0 && e>=AU_WARNING1)
-    hapticDefevent(1);
+    hapticDefevent(1);     
   else if (g_eeGeneral.hapticMode>0)
     hapticDefevent(0);
 }
@@ -104,6 +110,12 @@ inline void hapticBeepEvent(uint8_t e)
 {
   if (g_eeGeneral.hapticMode>=-1 && e>=3)
     hapticDefevent(1);
+  else if (e == AU_TIMER_30)
+    hapticDefevent(3);
+  else if (e == AU_TIMER_20)
+    hapticDefevent(2);   
+  else if (e == AU_TIMER_10)
+    hapticDefevent(1);     
   else if (g_eeGeneral.hapticMode==0 && e>0)
     hapticDefevent(1);
   else if (g_eeGeneral.hapticMode>0)