diff --git a/src/org/jitsi/impl/neomedia/MediaServiceImpl.java b/src/org/jitsi/impl/neomedia/MediaServiceImpl.java
index 1835f133c55480ef110707727e16b8599f4b3c29..c89747a5a1181b0b82096cac5bc4f78f5ff256ac 100644
--- a/src/org/jitsi/impl/neomedia/MediaServiceImpl.java
+++ b/src/org/jitsi/impl/neomedia/MediaServiceImpl.java
@@ -419,15 +419,6 @@ public MediaDevice getDefaultDevice(
             }
         }
 
-        /*
-         * Don't use the device in case the user has disabled all codecs for
-         * that kind of media.
-         */
-        if ((defaultDevice != null)
-                && (defaultDevice.getSupportedFormats().isEmpty()))
-        {
-            defaultDevice = null;
-        }
         return defaultDevice;
     }
 
@@ -1283,6 +1274,8 @@ public MediaDevice getMediaDeviceForPartialDesktopStreaming(
      */
     public boolean isPartialStreaming(MediaDevice mediaDevice)
     {
+        if(mediaDevice == null)
+            return false;
         MediaDeviceImpl dev = (MediaDeviceImpl)mediaDevice;
         CaptureDeviceInfo devInfo = dev.getCaptureDeviceInfo();