diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index cd2be42f3..0dfc89142 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -2550,8 +2550,7 @@ void CMoviePlayerGui::selectAudioPid()
 #if HAVE_CST_HARDWARE
    char cnt[5];
    sprintf(cnt, "%d", count);
-   std::string apidtitle = (currentac3 == 0) ? g_Locale->getText(LOCALE_AUDIOMENU_AC3_atype1) : g_Locale->getText(LOCALE_AUDIOMENU_AC3_atype0);
-   CMenuForwarder * item = new CMenuForwarder(apidtitle.c_str(), true, NULL, selector, cnt, CRCInput::convertDigitToKey(count + 1));
+   CMenuForwarder * item = new CMenuForwarder(currentac3 == CZapitAudioChannel::AC3 ? LOCALE_AUDIOMENU_AC3_ATYPE1 : LOCALE_AUDIOMENU_AC3_ATYPE0, true, NULL, selector, cnt, CRCInput::convertDigitToKey(count + 1));
    APIDSelector.addItem(item, false);
 #endif
    int percent[numpida+1];
@@ -2583,13 +2582,7 @@ void CMoviePlayerGui::selectAudioPid()
        playback->SetAPid(currentapid, currentac3);
        printf("[movieplayer] currentac3 changed to %d\n", currentac3);
    }
-   else if ((select >= 0) && (currentapid != apids[select])) {
-       currentapid = apids[select];
-       currentac3 = ac3flags[select];
-       playback->SetAPid(currentapid, currentac3);
-       getCurrentAudioName(is_file_player, currentaudioname);
-       printf("[movieplayer] apid changed to %d type %d\n", currentapid, currentac3);
-   }
+   else
 #else
    if ((select >= 0) && (currentapid != apids[select])) {
        currentapid = apids[select];
diff --git a/src/system/locals.h b/src/system/locals.h
index f83455f90..ba28d90f2 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -158,8 +158,8 @@ typedef enum
    LOCALE_AUDIO_SRS_VOLUME,
    LOCALE_AUDIOMENU_PCMOFFSET,
    LOCALE_AUDIOMENU_AC3,
-   LOCALE_AUDIOMENU_AC3_atype0,
-   LOCALE_AUDIOMENU_AC3_atype1,
+   LOCALE_AUDIOMENU_AC3_ATYPE0,
+   LOCALE_AUDIOMENU_AC3_ATYPE1,
    LOCALE_AUDIOMENU_ANALOG_MODE,
    LOCALE_AUDIOMENU_ANALOG_OUT,
    LOCALE_AUDIOMENU_AUTO_LANG,