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 3e774b915b884b1c140fd55ccccd542f7aeeb221..567ceb523fdf44be9903eaa078f3ecab4b1b224b 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
@@ -293,7 +293,7 @@ export class TopicCloudAdministrationComponent implements OnInit, OnDestroy {
       startDate: this.startDate.length ? this.startDate : null,
       endDate: this.endDate.length ? this.endDate : null
     };
-    this.topicCloudAdminService.setAdminData(this.topicCloudAdminData, true, this.userRole);
+    this.topicCloudAdminService.setAdminData(this.topicCloudAdminData, true, this.data.user.role);
   }
 
   setDefaultAdminData() {
diff --git a/src/app/components/shared/tag-cloud/tag-cloud.component.ts b/src/app/components/shared/tag-cloud/tag-cloud.component.ts
index d2c8a44b93152764c135c9b51ce1ce0be8aae3e6..65145b71b18ad2d57619a063e5a9b8930488b9cf 100644
--- a/src/app/components/shared/tag-cloud/tag-cloud.component.ts
+++ b/src/app/components/shared/tag-cloud/tag-cloud.component.ts
@@ -410,10 +410,10 @@ export class TagCloudComponent implements OnInit, OnDestroy, AfterContentInit, A
     const debounceTime = 1_000;
     const current = new Date().getTime();
     const diff = current - this.lastDebounceTime;
+    clearTimeout(this.debounceTimer);
     if (diff >= debounceTime) {
       this.redraw(dataUpdated);
     } else {
-      clearTimeout(this.debounceTimer);
       this.debounceTimer = setTimeout(() => {
         this.redraw(dataUpdated);
       }, debounceTime - diff);
diff --git a/src/app/services/util/tag-cloud-data.service.ts b/src/app/services/util/tag-cloud-data.service.ts
index f9f9c043ee0b8334b8b1c5f6df7c4daf70ba0f78..d3762dcdaec95eb0141190c5d59a87129fabf7e1 100644
--- a/src/app/services/util/tag-cloud-data.service.ts
+++ b/src/app/services/util/tag-cloud-data.service.ts
@@ -294,11 +294,11 @@ export class TagCloudDataService {
     }
     const currentTime = new Date().getTime();
     const diff = currentTime - this._lastDebounceTime;
+    clearTimeout(this._debounceTimer);
     if (diff >= DEBOUNCE_TIME) {
       this._dataBus.next(newData);
       this._lastDebounceTime = currentTime;
     } else {
-      clearTimeout(this._debounceTimer);
       this._debounceTimer = setTimeout(() => {
         this._dataBus.next(newData);
         this._lastDebounceTime = new Date().getTime();