diff --git a/libs/ui/src/lib/assistant/assistant.component.ts b/libs/ui/src/lib/assistant/assistant.component.ts
index 274128152..41d5c598b 100644
--- a/libs/ui/src/lib/assistant/assistant.component.ts
+++ b/libs/ui/src/lib/assistant/assistant.component.ts
@@ -373,6 +373,14 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
       });
   }
 
+  public ngOnDestroy() {
+    if (this.preselectionTimeout) {
+      clearTimeout(this.preselectionTimeout);
+    }
+    this.unsubscribeSubject.next();
+    this.unsubscribeSubject.complete();
+  }
+
   public ngOnChanges() {
     this.accounts = this.user?.accounts ?? [];
 
@@ -589,14 +597,6 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
     this.isOpen = aIsOpen;
   }
 
-  public ngOnDestroy() {
-    if (this.preselectionTimeout) {
-      clearTimeout(this.preselectionTimeout);
-    }
-    this.unsubscribeSubject.next();
-    this.unsubscribeSubject.complete();
-  }
-
   private getCurrentAssistantListItem() {
     return this.assistantListItems.find(({ getHasFocus }) => {
       return getHasFocus;