diff --git a/src/frontend/app/administration/tag/tag-administration.component.html b/src/frontend/app/administration/tag/tag-administration.component.html
index d5f9f60ab6400cb76d378dc009fa9932ae8f2815..b201e9064652bd6445b5d99a3b7fb773124ce98d 100644
--- a/src/frontend/app/administration/tag/tag-administration.component.html
+++ b/src/frontend/app/administration/tag/tag-administration.component.html
@@ -38,7 +38,7 @@
                                     [matAutocomplete]="auto" [matChipInputFor]="chipList">
                             </mat-chip-list>
                             <mat-autocomplete #auto="matAutocomplete" (optionSelected)="selected($event)">
-                                <mat-option *ngFor="let tag of filteredOptions | async" [value]="tag"  [disabled]="isSelected(tag)">
+                                <mat-option *ngFor="let tag of filteredOptions | async" [value]="tag"  [disabled]="isSelected(tag) || tag.id == id">
                                     {{tag.label}}
                                 </mat-option>
                             </mat-autocomplete>
diff --git a/src/frontend/app/administration/tag/tag-administration.component.ts b/src/frontend/app/administration/tag/tag-administration.component.ts
index d38d621fed00bed3638a33b68179d2c141996029..9dc11b240bd8dda85fafef0d91f26c6a1251c2f7 100644
--- a/src/frontend/app/administration/tag/tag-administration.component.ts
+++ b/src/frontend/app/administration/tag/tag-administration.component.ts
@@ -61,19 +61,19 @@ export class TagAdministrationComponent implements OnInit {
     ) {
     }
 
-    async ngOnInit(): Promise<void> {
+    ngOnInit(): void {
         this.loading = true;
 
-        await this.getTags();
 
-        this.route.params.subscribe((params) => {
+        this.route.params.subscribe(async (params) => {
+            this.id = params['id'];
+            await this.getTags();
             if (typeof params['id'] === 'undefined') {
                 this.headerService.setHeader(this.lang.tagCreation);
                 this.creationMode = true;
                 this.loading = false;
             } else {
                 this.creationMode = false;
-                this.id = params['id'];
                 this.http.get(`../rest/tags/${this.id}`).pipe(
                     tap((data: any) => {
                         Object.keys(this.tag).forEach(element => {
@@ -146,12 +146,13 @@ export class TagAdministrationComponent implements OnInit {
         return new Promise((resolve) => {
             this.http.get('../rest/tags').pipe(
                 tap((data: any) => {
-                    this.tags = data.tags.filter((tag: any) => tag.id !== this.id).map((tag: any) => {
+                    this.tags = data.tags.map((tag: any) => {
                         return {
                             id: tag.id,
                             label: tag.label,
                             parentId: tag.parentId,
-                            countResources: tag.countResources
+                            countResources: tag.countResources,
+                            disabled: tag.id == this.id
                         };
                     });
                     resolve(true);