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 f42a4aac4..77742d61a 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -1009,6 +1009,12 @@ public class CallActivity extends AppCompatActivity {
                 peerConnectionFactory = null;
             }
 
+            localMediaStream.removeTrack(localAudioTrack);
+            localMediaStream.removeTrack(localVideoTrack);
+            localMediaStream = null;
+            localAudioTrack = null;
+            localVideoTrack = 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 6c7c8afcc..d82685055 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
@@ -99,6 +99,7 @@ public class MagicPeerConnectionWrapper {
         }
 
         if (peerConnection != null) {
+            peerConnection.removeStream(localMediaStream);
             peerConnection.close();
             peerConnection = null;
         }