diff --git a/src/Appwrite/Messaging/Adapter/Realtime.php b/src/Appwrite/Messaging/Adapter/Realtime.php
index 4269fa04d..ee42b9eff 100644
--- a/src/Appwrite/Messaging/Adapter/Realtime.php
+++ b/src/Appwrite/Messaging/Adapter/Realtime.php
@@ -273,12 +273,6 @@ class Realtime extends Adapter
                 $channels[] = 'teams.' . $payload->getId();
                 $roles = ['team:' . $payload->getId()];
 
-                break;
-            case strpos($event, 'database.collections.') === 0:
-                $channels[] = 'collections';
-                $channels[] = 'collections.' . $payload->getId();
-                $roles = $payload->getRead();
-
                 break;
             case strpos($event, 'database.documents.') === 0:
                 $channels[] = 'documents';
@@ -287,8 +281,9 @@ class Realtime extends Adapter
                 $roles = $payload->getRead();
 
                 break;
-            case strpos($event, 'storage.') === 0:
+            case strpos($event, 'storage.files') === 0:
                 $channels[] = 'files';
+                $channels[] = 'buckets.' . $payload->getAttribute('bucketId') . '.files';
                 $channels[] = 'files.' . $payload->getId();
                 $roles = $payload->getRead();