diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
index 47d86f50ea..4abb70bc12 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
@@ -49,7 +49,7 @@ import { TagService } from '../../../tag/services/tag.service';
 import { CategoryService } from '../../../category/services/category.service';
 import { CategoriesManagementMode } from '../../../category/categories-management/categories-management-mode';
 import { MatExpansionPanel } from '@angular/material/expansion';
-import { AllowableOperationsEnum, ContentService } from '../../../common';
+import { AllowableOperationsEnum, ContentService } from '@alfresco/adf-content-services';
 import { ButtonType } from './button-type.enum';
 
 const DEFAULT_SEPARATOR = ', ';
diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.html b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.html
index 3b0199eb24..4a975153aa 100644
--- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.html
+++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.html
@@ -1,5 +1,5 @@
 <div class="adf-tags-creation">
-    <div class="adf-tag-name-field" *ngIf="(!tagNameControlVisible && tags.length) || tagNameControlVisible">
+    <div *ngIf="isNameTagsVisible" class="adf-tag-name-field">
         <mat-form-field class="adf-tag-search-field" appearance="fill">
             <input #tagNameInput
                     matInput 
@@ -14,7 +14,7 @@
     </div>
     <p
        class="adf-no-tags-message"
-       *ngIf="!tags.length">
+       *ngIf="!isEmpty">
         {{ 'TAG.TAGS_CREATOR.NO_TAGS_CREATED' | translate }}
     </p>
     <div
diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts
index 3e9f3e2f75..bb3fc2063c 100644
--- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts
+++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.ts
@@ -219,6 +219,14 @@ export class TagsCreatorComponent implements OnInit, OnDestroy {
         return this._tagNameControl;
     }
 
+    get isNameTagsVisible(): boolean {
+        return (!this.tagNameControlVisible && this.tags.length > 0) || this.tagNameControlVisible;
+    }
+
+    get isEmpty(): boolean {
+        return this.tags?.length > 0;
+    }
+
     get existingTags(): TagEntry[] {
         return this._existingTags;
     }