diff --git a/src/open9x.cpp b/src/open9x.cpp
index 57ba0696c..44ad5248f 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -228,7 +228,12 @@ void per10ms()
 #endif
 
 #if defined(FRSKY) && !defined(CPUARM) && !(defined(PCBSTD) && (defined(AUDIO) || defined(VOICE)))
+#if defined(DSM2_SERIAL)
+  if (s_current_protocol != PROTO_DSM2)
+    check_frsky();
+#else
   check_frsky();
+#endif
 #endif
 
   // These moved here from perOut() to improve beep trigger reliability.
diff --git a/src/pulses_avr.cpp b/src/pulses_avr.cpp
index 822a0adc1..ba4cde6a3 100644
--- a/src/pulses_avr.cpp
+++ b/src/pulses_avr.cpp
@@ -742,7 +742,7 @@ void setupPulses()
   if (s_current_protocol != required_protocol) {
 
 #if defined(DSM2_SERIAL) && defined(FRSKY)
-    if (s_current_protocol == PROTO_DSM2) {
+    if (s_current_protocol == 255 || s_current_protocol == PROTO_DSM2) {
       FRSKY_Init();
     }
 #endif