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 abfe78367..f42a4aac4 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -1009,9 +1009,7 @@ public class CallActivity extends AppCompatActivity {
                 peerConnectionFactory = null;
             }
 
-
             hangupNetworkCalls();
-
         }
     }
 
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 04e3173e5..6c7c8afcc 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
@@ -99,7 +99,7 @@ public class MagicPeerConnectionWrapper {
         }
 
         if (peerConnection != null) {
-            peerConnection.dispose();
+            peerConnection.close();
             peerConnection = null;
         }
     }
@@ -185,7 +185,7 @@ public class MagicPeerConnectionWrapper {
 
         @Override
         public void onStateChange() {
-            if (magicDataChannel.state().equals(DataChannel.State.OPEN) &&
+            if (magicDataChannel != null && magicDataChannel.state().equals(DataChannel.State.OPEN) &&
                     magicDataChannel.label().equals("status")) {
                 sendInitialMediaStatus();
             }