diff --git a/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.html b/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.html
index 0ba3df0377..b4ea6b538f 100644
--- a/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.html
+++ b/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.html
@@ -4,11 +4,11 @@
     [class.adf-dynamic-chip-list-button-in-next-line]="moveLoadMoreButtonToNextRow"
     [class.adf-dynamic-chip-list-paginated]="paginationData"
     #nodeListContainer>
-    <mat-chip-listbox
+    <mat-chip-set
         [class.adf-dynamic-chip-list-full-width]="limitChipsDisplayed && !calculationsDone"
         role="listbox"
         [attr.aria-label]="'METADATA.BASIC.TAGS' | translate">
-        <mat-chip-option
+        <mat-chip
             class="adf-dynamic-chip-list-chip"
             *ngFor="let chip of chipsToDisplay; let idx = index"
             (removed)="removedChip.emit(chip.id)">
@@ -20,8 +20,8 @@
                 matChipRemove>
                 cancel
             </mat-icon>
-        </mat-chip-option>
-    </mat-chip-listbox>
+        </mat-chip>
+    </mat-chip-set>
     <button
         data-automation-id="adf-dynamic-chip-list-view-more-button"
         mat-button