diff --git a/libs/common/src/lib/interfaces/user.interface.ts b/libs/common/src/lib/interfaces/user.interface.ts
index 2891314a0..27cd1a610 100644
--- a/libs/common/src/lib/interfaces/user.interface.ts
+++ b/libs/common/src/lib/interfaces/user.interface.ts
@@ -23,5 +23,5 @@ export interface User {
     offer: SubscriptionOffer;
     type: SubscriptionType;
   };
-  tags: Tag[];
+  tags: (Tag & { isUsed: boolean })[];
 }
diff --git a/libs/ui/src/lib/assistant/assistant.component.ts b/libs/ui/src/lib/assistant/assistant.component.ts
index c60e93d88..e66f1accb 100644
--- a/libs/ui/src/lib/assistant/assistant.component.ts
+++ b/libs/ui/src/lib/assistant/assistant.component.ts
@@ -269,6 +269,16 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
       this.filterForm.enable({ emitEvent: false });
     }
 
+    this.tags = this.user?.tags
+      .filter((tag) => tag.isUsed)
+      .map(({ id, name }) => {
+        return {
+          id,
+          label: translate(name),
+          type: 'TAG'
+        };
+      });
+
     this.filterForm.setValue(
       {
         account: this.user?.settings?.['filters.accounts']?.[0] ?? null,