diff --git a/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java b/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java
index 01222e003..70f6de6ab 100644
--- a/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java
+++ b/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java
@@ -209,7 +209,7 @@ public void start(boolean masterSession)
      */
     public void setMultistream(SrtpControl master)
     {
-        if(master == null)
+        if(master == null || master == this)
             return;
 
         if(!(master instanceof ZrtpControlImpl))