diff --git a/app/Http/Middleware/AssetCountForSidebar.php b/app/Http/Middleware/AssetCountForSidebar.php
index e529f75ef..9d81eca93 100644
--- a/app/Http/Middleware/AssetCountForSidebar.php
+++ b/app/Http/Middleware/AssetCountForSidebar.php
@@ -21,25 +21,36 @@ class AssetCountForSidebar
         /**
          * This needs to be set for the /setup process, since the tables might not exist yet
          */
+        $total_assets = 0;
         $total_due_for_checkin = 0;
         $total_overdue_for_checkin = 0;
         $total_due_for_audit = 0;
         $total_overdue_for_audit = 0;
 
         try {
-            $total_rtd_sidebar = Asset::RTD()->count();
-            view()->share('total_rtd_sidebar', $total_rtd_sidebar);
+            $settings = Setting::getSettings();
+            view()->share('settings', $settings);
         } catch (\Exception $e) {
             \Log::debug($e);
         }
 
         try {
-            $total_assets = Asset::RTD()->count();
+            $total_assets = Asset::all()->count();
+            if ($settings->show_archived_in_list != '1') {
+                $total_assets -= Asset::Archived()->count();
+            }
             view()->share('total_assets', $total_assets);
         } catch (\Exception $e) {
             \Log::debug($e);
         }
 
+        try {
+            $total_rtd_sidebar = Asset::RTD()->count();
+            view()->share('total_rtd_sidebar', $total_rtd_sidebar);
+        } catch (\Exception $e) {
+            \Log::debug($e);
+        }
+
         try {
             $total_deployed_sidebar = Asset::Deployed()->count();
             view()->share('total_deployed_sidebar', $total_deployed_sidebar);
@@ -75,13 +86,6 @@ class AssetCountForSidebar
             \Log::debug($e);
         }
 
-        try {
-            $settings = Setting::getSettings();
-            view()->share('settings', $settings);
-        } catch (\Exception $e) {
-            \Log::debug($e);
-        }
-
         try {
             $total_due_for_audit = Asset::DueForAudit($settings)->count();
             view()->share('total_due_for_audit', $total_due_for_audit);