diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 95e74d60c1..4b6895d6ea 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -10272,7 +10272,7 @@ parameters:
 
 		-
 			message: "#^Cannot access offset 'favoriteTables'\\|'recentTables' on mixed\\.$#"
-			count: 3
+			count: 4
 			path: src/Favorites/RecentFavoriteTable.php
 
 		-
@@ -10282,7 +10282,7 @@ parameters:
 
 		-
 			message: "#^Cannot access offset mixed on mixed\\.$#"
-			count: 3
+			count: 4
 			path: src/Favorites/RecentFavoriteTable.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index beee069242..ab947400ae 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -5936,6 +5936,8 @@
     </MixedArrayAccess>
     <MixedArrayAssignment>
       <code><![CDATA[$_SESSION['tmpval'][$this->tableType->value . 'Tables']]]></code>
+      <code><![CDATA[$_SESSION['tmpval'][$this->tableType->value . 'Tables']]]></code>
+      <code><![CDATA[$_SESSION['tmpval'][$this->tableType->value . 'Tables'][$serverId]]]></code>
       <code><![CDATA[$_SESSION['tmpval'][$this->tableType->value . 'Tables'][$serverId]]]></code>
     </MixedArrayAssignment>
     <MixedAssignment>
diff --git a/src/Favorites/RecentFavoriteTable.php b/src/Favorites/RecentFavoriteTable.php
index 88af6b7342..8fbd171eaa 100644
--- a/src/Favorites/RecentFavoriteTable.php
+++ b/src/Favorites/RecentFavoriteTable.php
@@ -71,7 +71,13 @@ class RecentFavoriteTable
                 : [];
         }
 
-        $this->tables =& $_SESSION['tmpval'][$this->tableType->value . 'Tables'][$serverId];
+        $this->tables = $_SESSION['tmpval'][$this->tableType->value . 'Tables'][$serverId];
+    }
+
+    public function __destruct()
+    {
+        $serverId = $GLOBALS['server'];
+        $_SESSION['tmpval'][$this->tableType->value . 'Tables'][$serverId] = $this->tables;
     }
 
     /**