diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
index cee8d2e7c..25c433c13 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
@@ -311,9 +311,10 @@ else if (deviceNumber > 1)
 
             selectDialog.setVisible(true);
 
-            createDesktopSharing(   protocolProvider,
-                                    contact,
-                                    selectDialog.getSelectedDevice());
+            if (selectDialog.getSelectedDevice() != null)
+                createDesktopSharing(   protocolProvider,
+                                        contact,
+                                        selectDialog.getSelectedDevice());
         }
     }
 
@@ -424,8 +425,9 @@ else if (deviceNumber > 1)
 
                 selectDialog.setVisible(true);
 
-                enableDesktopSharing(
-                    call, selectDialog.getSelectedDevice(), enable);
+                if (selectDialog.getSelectedDevice() != null)
+                    enableDesktopSharing(
+                        call, selectDialog.getSelectedDevice(), enable);
             }
         }
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/SelectScreenDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/SelectScreenDialog.java
index 2f0550945..2afde62f6 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/SelectScreenDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/SelectScreenDialog.java
@@ -134,6 +134,7 @@ public void actionPerformed(ActionEvent e)
         {
             public void actionPerformed(ActionEvent e)
             {
+                selectedDevice = null;
                 dispose();
             }
         });