diff --git a/src/TenantManager.php b/src/TenantManager.php
index e80bf656..9cd2b2ff 100644
--- a/src/TenantManager.php
+++ b/src/TenantManager.php
@@ -145,8 +145,11 @@ class TenantManager
      */
     public function ensureTenantCanBeCreated(Tenant $tenant): void
     {
+        if ($this->shouldCreateDatabase($tenant)) {
+            $this->database->ensureTenantCanBeCreated($tenant);
+        }
+        
         $this->storage->ensureTenantCanBeCreated($tenant);
-        $this->database->ensureTenantCanBeCreated($tenant);
     }
 
     /**