diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
index d485ee963..5be79df36 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
@@ -82,7 +82,7 @@ class MagicCallActivity : BaseActivity() {
                     RouterTransaction.with(CallController(intent.extras))
                         .pushChangeHandler(HorizontalChangeHandler())
                         .popChangeHandler(HorizontalChangeHandler())
-                        .tag("CallController")
+                        .tag(CallController.TAG)
                 )
             }
         }
@@ -153,7 +153,7 @@ class MagicCallActivity : BaseActivity() {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
         isInPipMode = isInPictureInPictureMode
 
-        val callController = router?.getControllerWithTag("CallController") as CallController
+        val callController = router?.getControllerWithTag(CallController.TAG) as CallController
         if (isInPictureInPictureMode) {
             callController.updateUiForPipMode()
         } else {
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 b9c6e60d5..98c318469 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -161,7 +161,7 @@ import pub.devrel.easypermissions.AfterPermissionGranted;
 @AutoInjector(NextcloudTalkApplication.class)
 public class CallController extends BaseController {
 
-    private static final String TAG = "CallController";
+    public static final String TAG = "CallController";
 
     private static final String[] PERMISSIONS_CALL = {
             android.Manifest.permission.CAMERA,
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
index 04030bce1..5ac497949 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
@@ -200,7 +200,8 @@ public class CallNotificationController extends BaseController {
 
         getRouter().replaceTopController(RouterTransaction.with(new CallController(originalBundle))
                                                  .popChangeHandler(new HorizontalChangeHandler())
-                                                 .pushChangeHandler(new HorizontalChangeHandler()));
+                                                 .pushChangeHandler(new HorizontalChangeHandler())
+                                                 .tag(CallController.TAG));
     }
 
     private void checkIfAnyParticipantsRemainInRoom() {