diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
index b8eb3339a6e8c699d50534d7d465d980c28fb419..c89afd3526c3f3a06dcb34cc7d3698c4d8523fbd 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
+++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
@@ -75,9 +75,10 @@ export class TopicCloudAdministrationComponent implements OnInit, OnDestroy {
     this.deviceType = localStorage.getItem('deviceType');
     this.wsCommentServiceService.getCommentStream(localStorage.getItem('roomId')).subscribe(_ => this.updateKeywords());
     this.blacklistSubscription = this.topicCloudAdminService.getBlacklist().subscribe(list => this.blacklist = list);
+    this.profanitywordlist = this.topicCloudAdminService.getProfanityListFromStorage();
     this.profanitylistSubscription = this.topicCloudAdminService.getCustomProfanityList().subscribe(list => {
-      this.profanitywordlist = list;
       this.updateKeywords();
+      this.profanitywordlist = list;
     });
     this.isCreatorOrMod = this.data.user.role !== UserRole.PARTICIPANT;
     this.translateService.use(localStorage.getItem('currentLang'));
@@ -171,10 +172,6 @@ export class TopicCloudAdministrationComponent implements OnInit, OnDestroy {
     return this.topicCloudAdminService.filterProfanityWords(keyword);
   }
 
-  getProfanityList() {
-    return this.topicCloudAdminService.getCustomProfanityList();
-  }
-
   sortQuestions(sortMode?: string) {
     if (sortMode !== undefined) {
       this.sortMode = sortMode;
diff --git a/src/app/services/util/topic-cloud-admin.service.ts b/src/app/services/util/topic-cloud-admin.service.ts
index a0c2d6fa9937359d53b3adecff9949713119be37..8e0d7c51fae787188b91b3eb578683820365b98d 100644
--- a/src/app/services/util/topic-cloud-admin.service.ts
+++ b/src/app/services/util/topic-cloud-admin.service.ts
@@ -63,13 +63,9 @@ export class TopicCloudAdminService {
         _adminData.blacklist.concat(list);
       }
       if (_adminData.profanityFilter){
-        this.getCustomProfanityList().subscribe(plist => {
-          _adminData.blacklist = plist.concat(this.profanityWords);
-          this.adminData.next(_adminData);
-        });
-      } else {
-        this.adminData.next(_adminData);
+        _adminData.blacklist = this.getProfanityListFromStorage().concat(this.profanityWords);
       }
+      this.adminData.next(_adminData);
     });
   }