diff --git a/app/init.php b/app/init.php
index 94423974ee..442a6b8248 100644
--- a/app/init.php
+++ b/app/init.php
@@ -1125,9 +1125,9 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForConsole,
 
     $database
         ->setNamespace('_' . $project->getInternalId())
-        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS)
         ->setMetadata('host', \gethostname())
-        ->setMetadata('project', $project->getId());
+        ->setMetadata('project', $project->getId())
+        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
 
     return $database;
 }, ['pools', 'dbForConsole', 'cache', 'project']);
@@ -1143,9 +1143,9 @@ App::setResource('dbForConsole', function (Group $pools, Cache $cache) {
 
     $database
         ->setNamespace('_console')
-        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS)
         ->setMetadata('host', \gethostname())
-        ->setMetadata('project', 'console');
+        ->setMetadata('project', 'console')
+        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
 
     return $database;
 }, ['pools', 'cache']);
@@ -1165,9 +1165,9 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
 
             $database
                 ->setNamespace('_' . $project->getInternalId())
-                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS)
                 ->setMetadata('host', \gethostname())
-                ->setMetadata('project', $project->getId());
+                ->setMetadata('project', $project->getId())
+                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
 
             return $database;
         }
@@ -1183,9 +1183,9 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
 
         $database
             ->setNamespace('_' . $project->getInternalId())
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS)
             ->setMetadata('host', \gethostname())
-            ->setMetadata('project', $project->getId());
+            ->setMetadata('project', $project->getId())
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
 
         return $database;
     };
diff --git a/app/realtime.php b/app/realtime.php
index 97120bf2f8..a783751ff9 100644
--- a/app/realtime.php
+++ b/app/realtime.php
@@ -50,7 +50,7 @@ function getConsoleDB(): Database
     $database
         ->setNamespace('_console')
         ->setMetadata('host', \gethostname())
-        ->setMetadata('project', $project->getId());
+        ->setMetadata('project', '_console');
 
     return $database;
 }