diff --git a/src/StorageDrivers/Database/DatabaseStorageDriver.php b/src/StorageDrivers/Database/DatabaseStorageDriver.php
index c18dbad8..9934ebf5 100644
--- a/src/StorageDrivers/Database/DatabaseStorageDriver.php
+++ b/src/StorageDrivers/Database/DatabaseStorageDriver.php
@@ -80,7 +80,7 @@ class DatabaseStorageDriver implements StorageDriver
     public function createTenant(Tenant $tenant): void
     {
         $this->centralDatabase->transaction(function () use ($tenant) {
-            Tenants::create(['id' => $tenant->id, 'data' => '{}'])->toArray();
+            Tenants::create(['id' => $tenant->id, 'data' => json_encode($tenant->data)])->toArray();
 
             $domainData = [];
             foreach ($tenant->domains as $domain) {
diff --git a/tests/TenantClassTest.php b/tests/TenantClassTest.php
index fc3965e8..4a3775f2 100644
--- a/tests/TenantClassTest.php
+++ b/tests/TenantClassTest.php
@@ -94,4 +94,15 @@ class TenantClassTest extends TestCase
         $this->expectException(\BadMethodCallException::class);
         $tenant->sdjigndfgnjdfgj();
     }
+
+    /** @test */
+    public function tenant_data_can_be_set_during_creation()
+    {
+        Tenant::new()->withData(['foo' => 'bar'])->save();
+
+        $data = tenancy()->all()->first()->data;
+        unset($data['id']);
+
+        $this->assertSame(['foo' => 'bar'], $data);
+    }
 }