diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java
index 49d47538656..e6b8aceaa8f 100644
--- a/Mage.Server/src/main/java/mage/server/TableController.java
+++ b/Mage.Server/src/main/java/mage/server/TableController.java
@@ -448,7 +448,8 @@ public class TableController {
             if (userPlayerMap.get(userId) != null) {
                 return;
             }
-            UserManager.getInstance().getUser(userId).watchGame(match.getGame().getId(), getChatId());
+            UUID gameId = match.getGame().getId();
+            UserManager.getInstance().getUser(userId).watchGame(gameId, GameManager.getInstance().getChatId(gameId));
         }
     }