diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php
index 9e35852ba..7fb15a2b6 100644
--- a/app/Http/Controllers/Common/Dashboards.php
+++ b/app/Http/Controllers/Common/Dashboards.php
@@ -51,7 +51,7 @@ class Dashboards extends Controller
     {
         $dashboard_id = session('dashboard_id', 0);
 
-        if ($dashboard) {
+        if (!empty($dashboard->id)) {
             $dashboard_id = $dashboard->id;
         }
 
diff --git a/app/Listeners/Menu/AddAdminItems.php b/app/Listeners/Menu/AddAdminItems.php
index 52436c76e..c17c4bb38 100644
--- a/app/Listeners/Menu/AddAdminItems.php
+++ b/app/Listeners/Menu/AddAdminItems.php
@@ -26,9 +26,11 @@ class AddAdminItems
             if ($dashboards->count() > 1) {
                 $menu->dropdown(trim(trans_choice('general.dashboards', 2)), function ($sub) use ($user, $attr, $dashboards) {
                     foreach ($dashboards as $key => $dashboard) {
-                        $path = (session('dashboard_id') == $dashboard->id) ? '/' : '/?dashboard_id=' . $dashboard->id;
-
-                        $sub->url($path, $dashboard->name, $key, $attr);
+                        if (session('dashboard_id') != $dashboard->id) {
+                            $sub->route('dashboards.switch', $dashboard->name, ['dashboard' => $dashboard->id], $key, $attr);
+                        } else {
+                            $sub->url('/', $dashboard->name, $key, $attr);
+                        }
                     }
                 }, 1, [
                     'url' => '/',