diff --git a/app/Http/Controllers/Auth/Login.php b/app/Http/Controllers/Auth/Login.php
index d9a188986..9b45ec5f4 100644
--- a/app/Http/Controllers/Auth/Login.php
+++ b/app/Http/Controllers/Auth/Login.php
@@ -89,8 +89,6 @@ class Login extends Controller
             return response()->json($response);
         }
 
-        session(['dashboard_id' => $user->dashboards()->enabled()->pluck('id')->first()]);
-
         $response = [
             'status' => null,
             'success' => true,
diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php
index 93f20c636..b27a9e4fa 100644
--- a/app/Http/Controllers/Common/Dashboards.php
+++ b/app/Http/Controllers/Common/Dashboards.php
@@ -51,12 +51,10 @@ class Dashboards extends Controller
     {
         $dashboard_id = $dashboard_id ?? session('dashboard_id');
 
-        if (empty($dashboard_id)) {
-            $dashboard_id = user()->dashboards()->enabled()->pluck('id')->first();
-        }
-
         if (!empty($dashboard_id)) {
             $dashboard = Dashboard::find($dashboard_id);
+        } else {
+            $dashboard = user()->dashboards()->enabled()->first();
         }
 
         if (empty($dashboard)) {
@@ -67,6 +65,8 @@ class Dashboards extends Controller
             ]));
         }
 
+        session(['dashboard_id' => $dashboard->id]);
+
         $widgets = Widget::where('dashboard_id', $dashboard->id)->orderBy('sort', 'asc')->get()->filter(function ($widget) {
             return Widgets::canShow($widget->class);
         });