diff --git a/source/backend/plugin/LinuxSamplerPlugin.cpp b/source/backend/plugin/LinuxSamplerPlugin.cpp
index f1ad1d5d3..d310c17c8 100644
--- a/source/backend/plugin/LinuxSamplerPlugin.cpp
+++ b/source/backend/plugin/LinuxSamplerPlugin.cpp
@@ -234,7 +234,7 @@ public:
                             fSampler.RemoveSamplerChannel(fSamplerChannels[i]);
                             fSamplerChannels[i] = nullptr;
 
-                            if (fAudioOutputDevices[i] != nullptr)
+                            if (fAudioOutputDevices[i] != nullptr && fUses16Outs)
                             {
                                 delete fAudioOutputDevices[i];
                                 fAudioOutputDevices[i] = nullptr;
@@ -242,6 +242,12 @@ public:
                         }
                     }
 
+                    if (fAudioOutputDevices[0] != nullptr)
+                    {
+                        delete fAudioOutputDevices[0];
+                        fAudioOutputDevices[0] = nullptr;
+                    }
+
                     delete fMidiInputPort;
                     fMidiInputPort = nullptr;
                 }