diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36b4df8a2..ff52428dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved the tag selector to only show used tags in the assistant (experimental)
 - Improved the language localization for German (`de`)
 
 ### Fixed
diff --git a/libs/ui/src/lib/assistant/assistant.component.ts b/libs/ui/src/lib/assistant/assistant.component.ts
index 19cbaefcb..65c9e37fc 100644
--- a/libs/ui/src/lib/assistant/assistant.component.ts
+++ b/libs/ui/src/lib/assistant/assistant.component.ts
@@ -136,10 +136,8 @@ export class AssistantComponent implements OnChanges, OnDestroy, OnInit {
   ) {}
 
   public ngOnInit() {
-    const { tags } = this.dataService.fetchInfo();
-
     this.accounts = this.user?.accounts;
-    this.tags = tags.map(({ id, name }) => {
+    this.tags = this.user?.tags.map(({ id, name }) => {
       return {
         id,
         name: translate(name)