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 9cc6650078..3a4c13226b 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
@@ -17,7 +17,7 @@
     </p>
     <div class="adf-tags-list" [class.adf-tags-list-fixed]="!tagNameControlVisible" #tagsList>
         <mat-chip-listbox *ngIf="tags.length > 0">
-            <mat-chip-option *ngFor="let tag of tags" [disableRipple]="true" [title]="tag" class="adf-tags-chip">
+            <mat-chip *ngFor="let tag of tags" [disableRipple]="true" [title]="tag" class="adf-tags-chip">
                 {{ tag }}
                 <button
                     data-automation-id="remove-tag-button"
@@ -28,7 +28,7 @@
                     matChipRemove>
                     <mat-icon>close</mat-icon>
                 </button>
-            </mat-chip-option>
+            </mat-chip>
         </mat-chip-listbox>
     </div>
 </div>
diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss
index 43b46e72ed..6f2b7bcb0a 100644
--- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss
+++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss
@@ -45,6 +45,10 @@ adf-tags-creator {
         margin-top: 8px;
     }
 
+    .adf-tags-chip {
+        height: auto;
+    }
+
     .adf-existing-tags-panel {
         border-top-left-radius: 6px;
         border-top-right-radius: 6px;