diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index 03ed827d1..879bc1fe2 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -1403,7 +1403,7 @@ public class CallController extends BaseController {
                     @Override
                     public void onNext(GenericOverall genericOverall) {
                         if (hasExternalSignalingServer) {
-                            webSocketClient.joinRoomWithRoomTokenAndSession("", "");
+                            webSocketClient.joinRoomWithRoomTokenAndSession("", callSession);
                         }
 
                         if (isMultiSession) {
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 9465948af..aef7be6f3 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
@@ -91,7 +91,7 @@ public class MagicPeerConnectionWrapper {
                 new MagicPeerConnectionObserver());
 
         if (peerConnection != null) {
-            if (localSession != null && localMediaStream != null) {
+            if (localMediaStream != null) {
                 peerConnection.addStream(localMediaStream);
             }