diff --git a/app/cli/commandlineparser.cpp b/app/cli/commandlineparser.cpp
index bfd128a3..e6ee1342 100644
--- a/app/cli/commandlineparser.cpp
+++ b/app/cli/commandlineparser.cpp
@@ -194,8 +194,8 @@ StreamCommandLineParser::StreamCommandLineParser()
         {"borderless", StreamingPreferences::WM_FULLSCREEN_DESKTOP},
     };
     m_AudioConfigMap = {
-        {"stereo",   StreamingPreferences::AC_FORCE_STEREO},
-        {"surround", StreamingPreferences::AC_FORCE_SURROUND},
+        {"stereo",       StreamingPreferences::AC_STEREO},
+        {"5.1-surround", StreamingPreferences::AC_51_SURROUND},
     };
     m_VideoCodecMap = {
         {"auto",  StreamingPreferences::VCC_AUTO},
diff --git a/app/gui/SettingsView.qml b/app/gui/SettingsView.qml
index 964e02ee..9c27e390 100644
--- a/app/gui/SettingsView.qml
+++ b/app/gui/SettingsView.qml
@@ -408,11 +408,11 @@ ScrollView {
                         id: audioListModel
                         ListElement {
                             text: "Stereo"
-                            val: StreamingPreferences.AC_FORCE_STEREO
+                            val: StreamingPreferences.AC_STEREO
                         }
                         ListElement {
                             text: "5.1 surround sound"
-                            val: StreamingPreferences.AC_FORCE_SURROUND
+                            val: StreamingPreferences.AC_51_SURROUND
                         }
                     }
                     // ::onActivated must be used, as it only listens for when the index is changed by a human
diff --git a/app/settings/streamingpreferences.cpp b/app/settings/streamingpreferences.cpp
index 370a7ace..92c94afd 100644
--- a/app/settings/streamingpreferences.cpp
+++ b/app/settings/streamingpreferences.cpp
@@ -44,7 +44,7 @@ void StreamingPreferences::reload()
     enableMdns = settings.value(SER_MDNS, true).toBool();
     mouseAcceleration = settings.value(SER_MOUSEACCELERATION, false).toBool();
     audioConfig = static_cast<AudioConfig>(settings.value(SER_AUDIOCFG,
-                                                  static_cast<int>(AudioConfig::AC_AUTO)).toInt());
+                                                  static_cast<int>(AudioConfig::AC_STEREO)).toInt());
     videoCodecConfig = static_cast<VideoCodecConfig>(settings.value(SER_VIDEOCFG,
                                                   static_cast<int>(VideoCodecConfig::VCC_AUTO)).toInt());
     videoDecoderSelection = static_cast<VideoDecoderSelection>(settings.value(SER_VIDEODEC,
diff --git a/app/settings/streamingpreferences.h b/app/settings/streamingpreferences.h
index a0809632..6b4ce2a2 100644
--- a/app/settings/streamingpreferences.h
+++ b/app/settings/streamingpreferences.h
@@ -33,9 +33,8 @@ public:
 
     enum AudioConfig
     {
-        AC_AUTO,
-        AC_FORCE_STEREO,
-        AC_FORCE_SURROUND
+        AC_STEREO,
+        AC_51_SURROUND
     };
     Q_ENUM(AudioConfig)
 
diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp
index a99aba03..0bd06af7 100644
--- a/app/streaming/session.cpp
+++ b/app/streaming/session.cpp
@@ -328,10 +328,10 @@ void Session::initialize()
 
     switch (m_Preferences->audioConfig)
     {
-    case StreamingPreferences::AC_FORCE_STEREO:
+    case StreamingPreferences::AC_STEREO:
         m_StreamConfig.audioConfiguration = AUDIO_CONFIGURATION_STEREO;
         break;
-    case StreamingPreferences::AC_FORCE_SURROUND:
+    case StreamingPreferences::AC_51_SURROUND:
         m_StreamConfig.audioConfiguration = AUDIO_CONFIGURATION_51_SURROUND;
         break;
     }