diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 67b470b501..337dae993a 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -606,7 +606,9 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.bitstream.bundle.pipe(getFirstSucceededRemoteDataPayload(),
       mergeMap((bundle: Bundle) => bundle.item.pipe(getFirstSucceededRemoteDataPayload())))
       .subscribe((item) => {
-        if (item.firstMetadataValue('dspace.iiif.enabled').match('true') !== null) {
+        const regex = /(true|yes)/i;
+        if (item.firstMetadataValue('dspace.iiif.enabled') &&
+          item.firstMetadataValue('dspace.iiif.enabled').match(regex) !== null) {
           this.isIIIF = true;
           this.formLayout.iiifLabel.grid.host = this.newFormatBaseLayout;
           this.formLayout.iiifToc.grid.host = this.newFormatBaseLayout;