diff --git a/app/cli.php b/app/cli.php
index c98cc62e7c..76e15e2ff9 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -104,17 +104,17 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
         if (isset($databases[$databaseName])) {
             $database = $databases[$databaseName];
 
-            if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
+//            if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
                 $database
                     ->setShareTables(true)
                     ->setTenant($project->getInternalId())
                     ->setNamespace('');
-            } else {
-                $database
-                    ->setShareTables(false)
-                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
-            }
+//            } else {
+//                $database
+//                    ->setShareTables(false)
+//                    ->setTenant(null)
+//                    ->setNamespace('_' . $project->getInternalId());
+//            }
 
             return $database;
         }
@@ -128,17 +128,17 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
 
         $databases[$databaseName] = $database;
 
-        if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
+//        if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
             $database
                 ->setShareTables(true)
                 ->setTenant($project->getInternalId())
                 ->setNamespace('');
-        } else {
-            $database
-                ->setShareTables(false)
-                ->setTenant(null)
-                ->setNamespace('_' . $project->getInternalId());
-        }
+//        } else {
+//            $database
+//                ->setShareTables(false)
+//                ->setTenant(null)
+//                ->setNamespace('_' . $project->getInternalId());
+//        }
 
         $database
             ->setNamespace('_' . $project->getInternalId())
diff --git a/app/init.php b/app/init.php
index 2493386390..26ebdab7a9 100644
--- a/app/init.php
+++ b/app/init.php
@@ -1183,17 +1183,17 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
                 ->setMetadata('project', $project->getId())
                 ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
 
-            if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
+//            if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
                 $database
                     ->setShareTables(true)
                     ->setTenant($project->getInternalId())
                     ->setNamespace('');
-            } else {
-                $database
-                    ->setShareTables(false)
-                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
-            }
+//            } else {
+//                $database
+//                    ->setShareTables(false)
+//                    ->setTenant(null)
+//                    ->setNamespace('_' . $project->getInternalId());
+//            }
         });
 
         if (isset($databases[$databaseName])) {
diff --git a/app/worker.php b/app/worker.php
index 989f1223af..a3ff06f9a5 100644
--- a/app/worker.php
+++ b/app/worker.php
@@ -75,17 +75,17 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
         ->setMetadata('host', \gethostname())
         ->setMetadata('project', $project->getId());
 
-    if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
+//    if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
         $database
             ->setShareTables(true)
             ->setTenant($project->getInternalId())
             ->setNamespace('');
-    } else {
-        $database
-            ->setShareTables(false)
-            ->setTenant(null)
-            ->setNamespace('_' . $project->getInternalId());
-    }
+//    } else {
+//        $database
+//            ->setShareTables(false)
+//            ->setTenant(null)
+//            ->setNamespace('_' . $project->getInternalId());
+//    }
 
     return $database;
 }, ['cache', 'register', 'message', 'dbForConsole']);
@@ -114,17 +114,17 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
         if (isset($databases[$databaseName])) {
             $database = $databases[$databaseName];
 
-            if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
+//            if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
                 $database
                     ->setShareTables(true)
                     ->setTenant($project->getInternalId())
                     ->setNamespace('');
-            } else {
-                $database
-                    ->setShareTables(false)
-                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
-            }
+//            } else {
+//                $database
+//                    ->setShareTables(false)
+//                    ->setTenant(null)
+//                    ->setNamespace('_' . $project->getInternalId());
+//            }
 
             return $database;
         }
@@ -138,17 +138,17 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
 
         $databases[$databaseName] = $database;
 
-        if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
+//        if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
             $database
                 ->setShareTables(true)
                 ->setTenant($project->getInternalId())
                 ->setNamespace('');
-        } else {
-            $database
-                ->setShareTables(false)
-                ->setTenant(null)
-                ->setNamespace('_' . $project->getInternalId());
-        }
+//        } else {
+//            $database
+//                ->setShareTables(false)
+//                ->setTenant(null)
+//                ->setNamespace('_' . $project->getInternalId());
+//        }
 
         return $database;
     };