diff --git a/app/Http/Controllers/Common/Companies.php b/app/Http/Controllers/Common/Companies.php
index 96ca00d8b..02e13fcdd 100644
--- a/app/Http/Controllers/Common/Companies.php
+++ b/app/Http/Controllers/Common/Companies.php
@@ -213,7 +213,7 @@ class Companies extends Controller
             $old_company_id = session('company_id');
 
             session(['company_id' => $company->id]);
-            session(['dashboard_id' => $company->dashboards()->pluck('id')->first()]);
+            session(['dashboard_id' => user()->dashboards()->enabled()->pluck('id')->first()]);
 
             Overrider::load('settings');
 
diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php
index b27a9e4fa..7a23b2b52 100644
--- a/app/Http/Controllers/Common/Dashboards.php
+++ b/app/Http/Controllers/Common/Dashboards.php
@@ -215,7 +215,7 @@ class Dashboards extends Controller
 
             flash($message)->success();
 
-            session(['dashboard_id' => user()->dashboards()->pluck('id')->first()]);
+            session(['dashboard_id' => user()->dashboards()->enabled()->pluck('id')->first()]);
         } else {
             $message = $response['message'];