diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 258232e67e..bd76240b4d 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -258047,11 +258047,10 @@ public:
         const int inputIndex = inputNames.indexOf (inputDeviceName);
         const int outputIndex = outputNames.indexOf (outputDeviceName);
 
-        String deviceName (outputDeviceName);
-        if (deviceName.isEmpty())
-            deviceName = inputDeviceName;
+        String deviceName (outputIndex >= 0 ? outputDeviceName
+                                            : inputDeviceName);
 
-        if (index >= 0)
+        if (inputIndex >= 0 || outputIndex >= 0)
             return new ALSAAudioIODevice (deviceName,
                                           inputIds [inputIndex],
                                           outputIds [outputIndex]);
diff --git a/src/native/linux/juce_linux_Audio.cpp b/src/native/linux/juce_linux_Audio.cpp
index cb9f2cbe00..d16343847c 100644
--- a/src/native/linux/juce_linux_Audio.cpp
+++ b/src/native/linux/juce_linux_Audio.cpp
@@ -947,11 +947,10 @@ public:
         const int inputIndex = inputNames.indexOf (inputDeviceName);
         const int outputIndex = outputNames.indexOf (outputDeviceName);
 
-        String deviceName (outputDeviceName);
-        if (deviceName.isEmpty())
-            deviceName = inputDeviceName;
+        String deviceName (outputIndex >= 0 ? outputDeviceName
+                                            : inputDeviceName);
 
-        if (index >= 0)
+        if (inputIndex >= 0 || outputIndex >= 0)
             return new ALSAAudioIODevice (deviceName,
                                           inputIds [inputIndex],
                                           outputIds [outputIndex]);