diff --git a/src/Listeners/CreateTenantConnection.php b/src/Listeners/CreateTenantConnection.php
index b4983d32..f56f8055 100644
--- a/src/Listeners/CreateTenantConnection.php
+++ b/src/Listeners/CreateTenantConnection.php
@@ -6,6 +6,7 @@ namespace Stancl\Tenancy\Listeners;
 
 use Stancl\Tenancy\Database\Contracts\TenantWithDatabase;
 use Stancl\Tenancy\Database\DatabaseManager;
+use Stancl\Tenancy\Events\Contracts\TenancyEvent;
 use Stancl\Tenancy\Events\Contracts\TenantEvent;
 
 class CreateTenantConnection
@@ -15,10 +16,10 @@ class CreateTenantConnection
     ) {
     }
 
-    public function handle(TenantEvent $event): void
+    public function handle(TenancyEvent $event): void
     {
-        /** @var TenantWithDatabase */
-        $tenant = $event->tenant;
+        /** @var TenantWithDatabase $tenant */
+        $tenant = $event->tenancy->tenant;
 
         $this->database->createTenantConnection($tenant);
     }
diff --git a/tests/ManualModeTest.php b/tests/ManualModeTest.php
new file mode 100644
index 00000000..3670a136
--- /dev/null
+++ b/tests/ManualModeTest.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Support\Facades\Event;
+use Stancl\Tenancy\Events\TenancyInitialized;
+use Stancl\Tenancy\Listeners\CreateTenantConnection;
+use \Stancl\Tenancy\Tests\Etc\Tenant;
+
+test('manual tenancy initialization works', function () {
+    Event::listen(TenancyInitialized::class, CreateTenantConnection::class);
+
+    $tenant = Tenant::create();
+
+    tenancy()->initialize($tenant);
+
+    expect(tenancy()->initialized)->toBeTrue();
+});