diff --git a/src/app/+item-page/media-viewer/media-viewer.component.html b/src/app/+item-page/media-viewer/media-viewer.component.html
index 4a59f1fc68..a96c94e72a 100644
--- a/src/app/+item-page/media-viewer/media-viewer.component.html
+++ b/src/app/+item-page/media-viewer/media-viewer.component.html
@@ -4,26 +4,29 @@
     message="{{ 'loading.default' | translate }}"
     [showMessage]="false"
   ></ds-loading>
-  <div class="media-viewer" *ngIf="mediaList.length > 0">
-    <ng-container *ngIf="options.video">
-      <ng-container
-        *ngIf="
-          mediaList[0]?.format === 'video' || mediaList[0]?.format === 'audio'
-        "
-      >
-        <ds-media-viewer-video [medias]="mediaList"></ds-media-viewer-video>
+  <div class="media-viewer" *ngIf="!isLoading">
+    <ng-container *ngIf="mediaList.length > 0">
+      <ng-container *ngIf="options.video">
+        <ng-container
+          *ngIf="
+            mediaList[0]?.format === 'video' || mediaList[0]?.format === 'audio'
+          "
+        >
+          <ds-media-viewer-video [medias]="mediaList"></ds-media-viewer-video>
+        </ng-container>
       </ng-container>
-    </ng-container>
-    <ng-container *ngIf="options.image">
-      <ng-container *ngIf="mediaList[0]?.format === 'image'">
-        <ds-media-viewer-image [images]="mediaList"></ds-media-viewer-image>
+      <ng-container *ngIf="options.image">
+        <ng-container *ngIf="mediaList[0]?.format === 'image'">
+          <ds-media-viewer-image [images]="mediaList"></ds-media-viewer-image>
+        </ng-container>
       </ng-container>
     </ng-container>
     <ng-container
       *ngIf="
-        (!options.image || mediaList[0]?.format !== 'image') &&
-        (!options.video || mediaList[0]?.format !== 'video') &&
-        (!options.video || mediaList[0]?.format !== 'audio')
+        ((!options.image || mediaList[0]?.format !== 'image') &&
+          (!options.video || mediaList[0]?.format !== 'video') &&
+          (!options.video || mediaList[0]?.format !== 'audio')) ||
+        mediaList.length === 0
       "
     >
       <ds-media-viewer-image
diff --git a/src/app/+item-page/media-viewer/media-viewer.component.ts b/src/app/+item-page/media-viewer/media-viewer.component.ts
index a8d50beff5..07b679354a 100644
--- a/src/app/+item-page/media-viewer/media-viewer.component.ts
+++ b/src/app/+item-page/media-viewer/media-viewer.component.ts
@@ -41,22 +41,31 @@ export class MediaViewerComponent implements OnInit {
     this.mediaList$ = new BehaviorSubject([]);
     this.isLoading = true;
     this.loadRemoteData('ORIGINAL').subscribe((bitstreamsRD) => {
-      this.loadRemoteData('THUMBNAIL').subscribe((thumbnailsRD) => {
-        for (let index = 0; index < bitstreamsRD.payload.page.length; index++) {
-          bitstreamsRD.payload.page[index].format
-            .pipe(getFirstSucceededRemoteDataPayload())
-            .subscribe((format) => {
-              const current = this.mediaList$.getValue();
-              const mediaItem = this.createMediaViewerItem(
-                bitstreamsRD.payload.page[index],
-                format,
-                thumbnailsRD.payload && thumbnailsRD.payload.page[index]
-              );
-              this.mediaList$.next([...current, mediaItem]);
-            });
-        }
+      if (bitstreamsRD.payload.page.length === 0) {
         this.isLoading = false;
-      });
+        this.mediaList$.next([]);
+      } else {
+        this.loadRemoteData('THUMBNAIL').subscribe((thumbnailsRD) => {
+          for (
+            let index = 0;
+            index < bitstreamsRD.payload.page.length;
+            index++
+          ) {
+            bitstreamsRD.payload.page[index].format
+              .pipe(getFirstSucceededRemoteDataPayload())
+              .subscribe((format) => {
+                const current = this.mediaList$.getValue();
+                const mediaItem = this.createMediaViewerItem(
+                  bitstreamsRD.payload.page[index],
+                  format,
+                  thumbnailsRD.payload && thumbnailsRD.payload.page[index]
+                );
+                this.mediaList$.next([...current, mediaItem]);
+              });
+          }
+          this.isLoading = false;
+        });
+      }
     });
   }