diff --git a/src/haptic.cpp b/src/haptic.cpp
index 8e092e97c..2ae3a0574 100644
--- a/src/haptic.cpp
+++ b/src/haptic.cpp
@@ -115,6 +115,8 @@ void hapticQueue::event(uint8_t e)
       play(15, 3, PLAY_NOW);
     else if (e < AU_FRSKY_FIRST)
       play(15, 3, (e-AU_TIMER_10)|PLAY_NOW);
+    else if (e >= AU_FRSKY_LAST)
+      play(15, 3, e-AU_FRSKY_LAST);
   }
 }
 
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 513fdfcd9..0c4020637 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -1432,7 +1432,7 @@ void evalFunctions()
 
 #if defined(HAPTIC)
         if (sd->func == FUNC_HAPTIC) {
-          haptic.event(sd->param);
+          haptic.event(AU_FRSKY_LAST+sd->param);
         }
 #endif