diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp
index af428df71..882a8cf4c 100644
--- a/radio/src/audio_arm.cpp
+++ b/radio/src/audio_arm.cpp
@@ -333,10 +333,17 @@ void getSwitchAudioFile(char * filename, swsrc_t index)
 void getLogicalSwitchAudioFile(char * filename, int index, unsigned int event)
 {
   char * str = getModelAudioPath(filename);
+
+#if defined(PCBTARANIS)
+  *str++ = 'L';
+  *str++ = '1'+index;
+#else
   int len = STR_VSWITCHES[0];
   strncpy(str, &STR_VSWITCHES[1+len*(index+SWSRC_FIRST_LOGICAL_SWITCH)], len);
-  str[len] = '\0';
-  strcat(str, suffixes[event]);
+  str += len;
+#endif
+
+  strcpy(str, suffixes[event]);
   strcat(str, SOUNDS_EXT);
 }