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 e1b0a4c0b..ef184baee 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -1038,6 +1038,9 @@ public class CallController extends BaseController {
                     public void onNext(CallOverall callOverall) {
                         callSession = callOverall.getOcs().getData().getSessionId();
                         ApplicationWideCurrentRoomHolder.getInstance().setSession(callSession);
+                        ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
+                        ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomToken);
+                        ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(conversationUser);
                         callOrJoinRoomViaWebSocket();
                     }
 
@@ -1089,10 +1092,7 @@ public class CallController extends BaseController {
                             animateCallControls(false, 5000);
                         }
 
-                        ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
-                        ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomToken(roomToken);
                         ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
-                        ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(conversationUser);
 
                         if (needsPing) {
                             ncApi.pingCall(credentials, ApiUtils.getUrlForCallPing(baseUrl, roomToken))