diff --git a/src/org/jitsi/impl/neomedia/device/PortAudioSystem.java b/src/org/jitsi/impl/neomedia/device/PortAudioSystem.java
index 32a142000d74fd9a1a7bcebfc094b726afe0ea85..cdf199e9441dd45c18e46c84ab8f33a8ce6e01fb 100644
--- a/src/org/jitsi/impl/neomedia/device/PortAudioSystem.java
+++ b/src/org/jitsi/impl/neomedia/device/PortAudioSystem.java
@@ -129,7 +129,10 @@ protected void doInitialize()
             // otherwise a call currently using this device will fail.
             for(int i = 0; devices !=null && i < devices.size() && !found; ++i)
             {
-                if(devices.get(i).getUID().equals(deviceUID))
+                // using identifier (name or uid, cause there can be some
+                // uid that are null)
+                String id = devices.get(i).getIdentifier();
+                if(id.equals(deviceUID) || id.equals(name))
                 {
                     cdi = devices.get(i);
                     found = true;