diff --git a/src/Client.php b/src/Client.php
index 17b2bec..ab07677 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -32,8 +32,6 @@ public function __construct(string|PDO $uri)
 
     public function getDatabase(string $name): Database
     {
-        SqlRunner::exec($this->pdo, sprintf('CREATE SCHEMA IF NOT EXISTS %s', Identifier::quote($name)));
-
         return new Database($this, $name);
     }
 
diff --git a/src/Operation/CreateCollection.php b/src/Operation/CreateCollection.php
index 3441d2d..d6f6e7c 100644
--- a/src/Operation/CreateCollection.php
+++ b/src/Operation/CreateCollection.php
@@ -28,7 +28,8 @@ public function execute(PDO $pdo, QueryBuilder $queryBuilder): bool
         SqlRunner::exec(
             $pdo,
             sprintf(
-                'CREATE TABLE IF NOT EXISTS %s.%s (_id TEXT PRIMARY KEY, data JSONB NOT NULL)',
+                'CREATE SCHEMA IF NOT EXISTS %s; CREATE TABLE IF NOT EXISTS %s.%s (_id TEXT PRIMARY KEY, data JSONB NOT NULL);',
+                $schema,
                 $schema,
                 $table,
             ),