diff --git a/src/Tenancy.php b/src/Tenancy.php
index 03df9767..c3258505 100644
--- a/src/Tenancy.php
+++ b/src/Tenancy.php
@@ -29,6 +29,10 @@ class Tenancy
             return;
         }
 
+        if ($this->initialized) {
+            $this->end();
+        }
+
         $this->tenant = $tenant;
 
         event(new Events\InitializingTenancy($this));