diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php
index edc361d266..4ec2cbe051 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php
@@ -20,7 +20,9 @@ abstract class Action extends UtopiaAction
 
     public function setHttpPath(string $path): UtopiaAction
     {
-        // Context is automatically set by Documents/Action.php setHttpPath for tablesdb paths
+        if (\str_contains($path, '/tablesdb')) {
+            $this->context = TABLES;
+        }
 
         return parent::setHttpPath($path);
     }