diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 66bf0b1ce..773bf4ef6 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -834,8 +834,6 @@ public class CallActivity extends AppCompatActivity {
                                                 userEntity.getToken()), ApiHelper.getUrlForSignaling(userEntity.getBaseUrl()))
                                                 .subscribeOn(Schedulers.newThread())
                                                 .observeOn(AndroidSchedulers.mainThread())
-                                                .repeatWhen(observable -> observable.delay(1500,
-                                                        TimeUnit.MILLISECONDS))
                                                 .repeatUntil(booleanSupplier)
                                                 .retry(3)
                                                 .subscribe(new Observer<SignalingOverall>() {
@@ -860,12 +858,10 @@ public class CallActivity extends AppCompatActivity {
 
                                                     @Override
                                                     public void onError(Throwable e) {
-                                                        dispose(signalingDisposable);
                                                     }
 
                                                     @Override
                                                     public void onComplete() {
-                                                        dispose(signalingDisposable);
                                                     }
                                                 });
 
@@ -969,7 +965,8 @@ public class CallActivity extends AppCompatActivity {
         Set<String> oldSesssions = new HashSet<>();
 
         for (HashMap<String, String> participant : users) {
-            if (!participant.get("sessionId").equals(callSession)) {
+            if (!participant.get("sessionId").equals(callSession) && !participant.get("userId").equals(userEntity
+                    .getUserId())) {
                 Object inCallObject = participant.get("inCall");
                 if ((boolean) inCallObject) {
                     newSessions.add(participant.get("sessionId"));
@@ -979,7 +976,6 @@ public class CallActivity extends AppCompatActivity {
             }
         }
 
-
         for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) {
             oldSesssions.add(magicPeerConnectionWrapper.getSessionId());
         }
@@ -1394,7 +1390,7 @@ public class CallActivity extends AppCompatActivity {
 
     private void registerNetworkReceiver() {
         IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction("android.net.conn.CONNECTIVITY_CHANGE");
+        intentFilter.addAction("android.net.conn.CONNECTIVITY_CHANxGE");
         intentFilter.addAction("android.net.wifi.STATE_CHANGE");
 
         this.registerReceiver(networkBroadcastReceier, intentFilter);
diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
index 92b2a2014..d5c166baa 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
@@ -133,7 +133,7 @@ public class MagicPeerConnectionWrapper {
     }
 
     public void sendChannelData(DataChannelMessage dataChannelMessage) {
-        ByteBuffer buffer = null;
+        ByteBuffer buffer;
         if (magicDataChannel != null) {
             try {
                 buffer = ByteBuffer.wrap(LoganSquare.serialize(dataChannelMessage).getBytes());
@@ -245,17 +245,13 @@ public class MagicPeerConnectionWrapper {
 
         @Override
         public void onSignalingChange(PeerConnection.SignalingState signalingState) {
-            if (signalingState.equals(PeerConnection.SignalingState.CLOSED)) {
-                EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
-                        .CLOSE_PEER, sessionId, null, null));
-            }
         }
 
         @Override
         public void onIceConnectionChange(PeerConnection.IceConnectionState iceConnectionState) {
             if (iceConnectionState.equals(PeerConnection.IceConnectionState.CONNECTED) && hasInitiated) {
                 sendInitialMediaStatus();
-            } else if (iceConnectionState.equals(PeerConnection.IceConnectionState.FAILED)) {
+            } else if (iceConnectionState.equals(PeerConnection.IceConnectionState.CLOSED)) {
                 EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
                         .CLOSE_PEER, sessionId, null, null));
             }