diff --git a/src/edacs-fme.c b/src/edacs-fme.c
index 6f18723..ce1a3d2 100644
--- a/src/edacs-fme.c
+++ b/src/edacs-fme.c
@@ -619,15 +619,15 @@ void edacs(dsd_opts * opts, dsd_state * state)
         else
           fprintf (stderr, " Digital");
 
-        //disable analog calls on RTL Input on ARM devices due to High CPU usage from RTL RMS function
+        //skip analog calls on RTL Input on ARM devices due to High CPU usage from RTL RMS function
         #ifdef __arm__
         if (command == 0xEE && opts->audio_in_type == 3)
-          command = 0;
+          goto ENDPV;
         #endif
 
-        //disable analog calls on UDP Audio Output
-        if (opts->audio_out_type == 8 && command == 0xEE)
-          command = 0;
+        //skip analog calls on UDP Audio Output
+        if (command == 0xEE && opts->audio_out_type == 8)
+          goto ENDPV;
 
         //this is working now with the new import setup
         if (opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0) ) //DE is digital encrypted, B is block
@@ -682,7 +682,9 @@ void edacs(dsd_opts * opts, dsd_state * state)
 
     } //end Standard or Networked
 
-  } 
+  }
+
+  ENDPV:
 
   fprintf (stderr, "\n");