diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index 257921e2ad6..c1a83d9b219 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -587,6 +587,7 @@ export class AppComponent implements OnInit, OnDestroy {
       await this.passwordGenerationService.clear(userBeingLoggedOut);
       await this.vaultTimeoutSettingsService.clear(userBeingLoggedOut);
       await this.biometricStateService.logout(userBeingLoggedOut as UserId);
+      await this.searchService.clearIndex();
 
       await this.stateEventRunnerService.handleEvent("logout", userBeingLoggedOut as UserId);
 
@@ -609,7 +610,6 @@ export class AppComponent implements OnInit, OnDestroy {
     // This must come last otherwise the logout will prematurely trigger
     // a process reload before all the state service user data can be cleaned up
     if (userBeingLoggedOut === preLogoutActiveUserId) {
-      await this.searchService.clearIndex();
       this.authService.logOut(async () => {
         if (expired) {
           this.platformUtilsService.showToast(