diff --git a/packages/panels/src/Panel/Concerns/HasRoutes.php b/packages/panels/src/Panel/Concerns/HasRoutes.php
index 14cb1d41d9..65a0ddc144 100644
--- a/packages/panels/src/Panel/Concerns/HasRoutes.php
+++ b/packages/panels/src/Panel/Concerns/HasRoutes.php
@@ -179,7 +179,7 @@ trait HasRoutes
             return $this->getRedirectUrl($tenant);
         }
 
-        if (Route::has($homeRouteName = $this->generateRouteName('home'))) {
+        if (((! $hasTenancy) || $tenant) && Route::has($homeRouteName = $this->generateRouteName('home'))) {
             return route($homeRouteName, $tenant ? ['tenant' => $tenant] : []);
         }