diff --git a/src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp b/src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp
index 0318c3d5cc..e2535d660f 100644
--- a/src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp
+++ b/src/juce_appframework/audio/devices/juce_AudioDeviceManager.cpp
@@ -411,6 +411,12 @@ const String AudioDeviceManager::setAudioDeviceSetup (const AudioDeviceSetup& ne
             outputChannels.clear();
             outputChannels.setRange (0, numOutputChansNeeded, true);
         }
+
+        if (newSetup.inputDeviceName.isEmpty())
+            inputChannels.clear();
+
+        if (newSetup.outputDeviceName.isEmpty())
+            outputChannels.clear();
     }
 
     if (! newSetup.useDefaultInputChannels)