diff --git a/src/Appwrite/Messaging/Adapter/Realtime.php b/src/Appwrite/Messaging/Adapter/Realtime.php
index 400589f677..2657ecccaa 100644
--- a/src/Appwrite/Messaging/Adapter/Realtime.php
+++ b/src/Appwrite/Messaging/Adapter/Realtime.php
@@ -312,8 +312,8 @@ class Realtime extends Adapter
                     }
 
                     $channels[] = 'rows';
-                    $channels[] = 'databases.' . $database->getId() .  '.tables.' . $payload->getAttribute('$collectionId') . '.rows';
-                    $channels[] = 'databases.' . $database->getId() . '.tables.' . $payload->getAttribute('$collectionId') . '.rows.' . $payload->getId();
+                    $channels[] = 'databases.' . $database->getId() .  '.tables.' . $payload->getAttribute('$tableId') . '.rows';
+                    $channels[] = 'databases.' . $database->getId() . '.tables.' . $payload->getAttribute('$tableId') . '.rows.' . $payload->getId();
 
                     $roles = $table->getAttribute('documentSecurity', false)
                         ? \array_merge($table->getRead(), $payload->getRead())
diff --git a/src/Appwrite/Utopia/Response/Model/Row.php b/src/Appwrite/Utopia/Response/Model/Row.php
index 49325bdc81..c84a81738d 100644
--- a/src/Appwrite/Utopia/Response/Model/Row.php
+++ b/src/Appwrite/Utopia/Response/Model/Row.php
@@ -36,7 +36,7 @@ class Row extends Any
                 'default' => '',
                 'example' => '5e5ea5c16897e',
             ])
-            ->addRule('$collectionId', [
+            ->addRule('$tableId', [
                 'type' => self::TYPE_STRING,
                 'description' => 'Table ID.',
                 'default' => '',
@@ -75,6 +75,11 @@ class Row extends Any
         $document->removeAttribute('$collection');
         $document->removeAttribute('$tenant');
 
+        $collectionId = $document->getAttribute('$collectionId');
+        $document
+            ->removeAttribute('$collectionId')
+            ->setAttribute('$tableId', $collectionId);
+
         foreach ($document->getAttributes() as $column) {
             if (\is_array($column)) {
                 foreach ($column as $subAttribute) {