diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index 327a278d1ec0..06386d90f915 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -151,12 +151,17 @@ class AccountRepository
         if ($user->hasPermission('view_all')) {
             $clients = Client::scope()
                         ->with('contacts', 'invoices')
-                        ->get();
+                        ->withArchived()
+                        ->with(['contacts', 'invoices' => function ($query) use ($user) {
+                            $query->withArchived();
+                        }])->get();
         } else {
             $clients = Client::scope()
                         ->where('user_id', '=', $user->id)
+                        ->withArchived()
                         ->with(['contacts', 'invoices' => function ($query) use ($user) {
-                            $query->where('user_id', '=', $user->id);
+                            $query->withArchived()
+                                  ->where('user_id', '=', $user->id);
                         }])->get();
         }