diff --git a/src/core/context/contextaudio.cpp b/src/core/context/contextaudio.cpp
index c6f43f2da..c7ccd3e93 100644
--- a/src/core/context/contextaudio.cpp
+++ b/src/core/context/contextaudio.cpp
@@ -321,29 +321,14 @@ namespace swift::core::context
         return this->getAudioDevices().getOutputDevices();
     }
 
-    CAudioDeviceInfoList CContextAudioBase::getAudioDevicesPlusDefault() const
-    {
-        return CAudioDeviceInfoList::allDevicesPlusDefault();
-    }
-
-    CAudioDeviceInfoList CContextAudioBase::getAudioInputDevicesPlusDefault() const
-    {
-        return this->getAudioDevicesPlusDefault().getInputDevices();
-    }
-
-    CAudioDeviceInfoList CContextAudioBase::getAudioOutputDevicesPlusDefault() const
-    {
-        return this->getAudioDevicesPlusDefault().getOutputDevices();
-    }
-
     CAudioDeviceInfoList CContextAudioBase::getCurrentAudioDevices() const
     {
         const QString inputDeviceName = m_inputDeviceSetting.get();
-        const CAudioDeviceInfo inputDevice = this->getAudioInputDevicesPlusDefault().findByNameOrDefault(
+        const CAudioDeviceInfo inputDevice = this->getAudioInputDevices().findByNameOrDefault(
             inputDeviceName, CAudioDeviceInfo::getDefaultInputDevice());
 
         const QString outputDeviceName = m_outputDeviceSetting.get();
-        const CAudioDeviceInfo outputDevice = this->getAudioOutputDevicesPlusDefault().findByNameOrDefault(
+        const CAudioDeviceInfo outputDevice = this->getAudioOutputDevices().findByNameOrDefault(
             outputDeviceName, CAudioDeviceInfo::getDefaultOutputDevice());
 
         CAudioDeviceInfoList devices;
diff --git a/src/core/context/contextaudio.h b/src/core/context/contextaudio.h
index b7a2d7ab5..e2b14c245 100644
--- a/src/core/context/contextaudio.h
+++ b/src/core/context/contextaudio.h
@@ -154,9 +154,6 @@ namespace swift::core
             swift::misc::audio::CAudioDeviceInfoList getAudioDevices() const;
             swift::misc::audio::CAudioDeviceInfoList getAudioInputDevices() const;
             swift::misc::audio::CAudioDeviceInfoList getAudioOutputDevices() const;
-            swift::misc::audio::CAudioDeviceInfoList getAudioDevicesPlusDefault() const;
-            swift::misc::audio::CAudioDeviceInfoList getAudioInputDevicesPlusDefault() const;
-            swift::misc::audio::CAudioDeviceInfoList getAudioOutputDevicesPlusDefault() const;
             //! @}
 
             //! Get current audio device
diff --git a/src/gui/components/audiodevicevolumesetupcomponent.cpp b/src/gui/components/audiodevicevolumesetupcomponent.cpp
index b657290d9..86bf0b751 100644
--- a/src/gui/components/audiodevicevolumesetupcomponent.cpp
+++ b/src/gui/components/audiodevicevolumesetupcomponent.cpp
@@ -382,7 +382,7 @@ namespace swift::gui::components
     void CAudioDeviceVolumeSetupComponent::initAudioDeviceLists()
     {
         if (!this->hasAudio()) { return; }
-        const bool changed = this->onAudioDevicesChanged(sGui->getCContextAudioBase()->getAudioDevicesPlusDefault());
+        const bool changed = this->onAudioDevicesChanged(sGui->getCContextAudioBase()->getAudioDevices());
         if (!changed) { return; }
         const CAudioDeviceInfoList currentDevices = sGui->getCContextAudioBase()->getCurrentAudioDevices();
         this->onAudioStarted(currentDevices.getInputDevices().frontOrDefault(),
@@ -525,14 +525,14 @@ namespace swift::gui::components
     CAudioDeviceInfo CAudioDeviceVolumeSetupComponent::getSelectedInputDevice() const
     {
         if (!hasAudio()) { return CAudioDeviceInfo(); }
-        const CAudioDeviceInfoList devices = sGui->getCContextAudioBase()->getAudioInputDevicesPlusDefault();
+        const CAudioDeviceInfoList devices = sGui->getCContextAudioBase()->getAudioInputDevices();
         return devices.findByName(ui->cb_SetupAudioInputDevice->currentText());
     }
 
     CAudioDeviceInfo CAudioDeviceVolumeSetupComponent::getSelectedOutputDevice() const
     {
         if (!hasAudio()) { return CAudioDeviceInfo(); }
-        const CAudioDeviceInfoList devices = sGui->getCContextAudioBase()->getAudioOutputDevicesPlusDefault();
+        const CAudioDeviceInfoList devices = sGui->getCContextAudioBase()->getAudioOutputDevices();
         return devices.findByName(ui->cb_SetupAudioOutputDevice->currentText());
     }
 
diff --git a/src/misc/audio/audiodeviceinfolist.cpp b/src/misc/audio/audiodeviceinfolist.cpp
index da61cf92f..7c332f0a4 100644
--- a/src/misc/audio/audiodeviceinfolist.cpp
+++ b/src/misc/audio/audiodeviceinfolist.cpp
@@ -157,27 +157,6 @@ namespace swift::misc::audio
         return i;
     }
 
-    CAudioDeviceInfoList CAudioDeviceInfoList::allInputDevicesPlusDefault()
-    {
-        CAudioDeviceInfoList i = allInputDevices();
-        i.push_back(CAudioDeviceInfoList::defaultInputDevice());
-        return i;
-    }
-
-    CAudioDeviceInfoList CAudioDeviceInfoList::allOutputDevicesPlusDefault()
-    {
-        CAudioDeviceInfoList o = allOutputDevices();
-        o.push_back(CAudioDeviceInfoList::defaultOutputDevice());
-        return o;
-    }
-
-    CAudioDeviceInfoList CAudioDeviceInfoList::allDevicesPlusDefault()
-    {
-        CAudioDeviceInfoList i = allInputDevicesPlusDefault();
-        i.push_back(allOutputDevicesPlusDefault());
-        return i;
-    }
-
     QList<QAudioDevice> CAudioDeviceInfoList::allQtInputDevices()
     {
         const QList<QAudioDevice> devices = QMediaDevices::audioInputs();
diff --git a/src/misc/audio/audiodeviceinfolist.h b/src/misc/audio/audiodeviceinfolist.h
index 34a7bcbf1..e48a86e32 100644
--- a/src/misc/audio/audiodeviceinfolist.h
+++ b/src/misc/audio/audiodeviceinfolist.h
@@ -86,9 +86,6 @@ namespace swift::misc::audio
         static CAudioDeviceInfoList allInputDevices();
         static CAudioDeviceInfoList allOutputDevices();
         static CAudioDeviceInfoList allDevices();
-        static CAudioDeviceInfoList allInputDevicesPlusDefault();
-        static CAudioDeviceInfoList allOutputDevicesPlusDefault();
-        static CAudioDeviceInfoList allDevicesPlusDefault();
         static QList<QAudioDevice> allQtInputDevices();
         static QList<QAudioDevice> allQtOutputDevices();
         static QAudioDevice defaultQtInputDevice();