diff --git a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.html b/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.html
index 61deb391d8..0e09172cf9 100644
--- a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.html
+++ b/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.html
@@ -1,105 +1,91 @@
-<div
-    *ngIf="viewerType === 'media' || viewerType === 'pdf' || viewerType === 'image' ? (isLoading || !isContentReady) : isLoading"
-    class="adf-viewer-render-main-loader"
->
+<div *ngIf="(viewerType === 'media' || viewerType === 'pdf' || viewerType === 'image') ? isLoading || !isContentReady : isLoading"
+    class="adf-viewer-render-main-loader">
     <div class="adf-viewer-render-layout-content adf-viewer__fullscreen-container">
         <div class="adf-viewer-render-content-container">
-            <div class="adf-viewer-render__loading-screen">
+            <div class="adf-viewer-render__loading-screen ">
                 <h2>{{ 'ADF_VIEWER.LOADING' | translate }}</h2>
                 <div>
-                    <mat-spinner class="adf-viewer-render__loading-screen__spinner" />
+                    <mat-spinner class="adf-viewer-render__loading-screen__spinner"/>
                 </div>
             </div>
         </div>
     </div>
 </div>
 
-<div
-    [hidden]="viewerType === 'media' || viewerType === 'pdf' || viewerType === 'image' ? (isLoading || !isContentReady) : isLoading"
-    class="adf-viewer-render-main"
->
+<div *ngIf="!isLoading"
+     class="adf-viewer-render-main">
     <div class="adf-viewer-render-layout-content adf-viewer__fullscreen-container">
         <div class="adf-viewer-render-content-container" [ngSwitch]="viewerType">
             <ng-container *ngSwitchCase="'external'">
-                <adf-preview-extension
-                    *ngIf="!!externalViewer"
-                    [id]="externalViewer.component"
-                    [url]="urlFile"
-                    [extension]="externalViewer.fileExtension"
-                    [nodeId]="nodeId"
-                    [attr.data-automation-id]="externalViewer.component"
-                />
+                <adf-preview-extension *ngIf="!!externalViewer"
+                                       [id]="externalViewer.component"
+                                       [url]="urlFile"
+                                       [extension]="externalViewer.fileExtension"
+                                       [nodeId]="nodeId"
+                                       [attr.data-automation-id]="externalViewer.component" />
             </ng-container>
 
             <ng-container *ngSwitchCase="'pdf'">
-                <adf-pdf-viewer
-                    [thumbnailsTemplate]="thumbnailsTemplate"
-                    [allowThumbnails]="allowThumbnails"
-                    [blobFile]="blobFile"
-                    [urlFile]="urlFile"
-                    [fileName]="internalFileName"
-                    [cacheType]="cacheTypeForContent"
-                    (pagesLoaded)="isContentReady = true"
-                    (close)="onClose()"
-                    (error)="onUnsupportedFile()"
-                />
+                <adf-pdf-viewer [thumbnailsTemplate]="thumbnailsTemplate"
+                                [allowThumbnails]="allowThumbnails"
+                                [blobFile]="blobFile"
+                                [urlFile]="urlFile"
+                                [fileName]="internalFileName"
+                                [cacheType]="cacheTypeForContent"
+                                (pagesLoaded)="isContentReady = true"
+                                (close)="onClose()"
+                                (error)="onUnsupportedFile()" />
             </ng-container>
 
             <ng-container *ngSwitchCase="'image'">
-                <adf-img-viewer
-                    [urlFile]="urlFile"
-                    [readOnly]="readOnly"
-                    [fileName]="internalFileName"
-                    [allowedEditActions]="allowedEditActions"
-                    [blobFile]="blobFile"
-                    (error)="onUnsupportedFile()"
-                    (submit)="onSubmitFile($event)"
-                    (imageLoaded)="isContentReady = true"
-                    (isSaving)="isSaving.emit($event)"
+                <adf-img-viewer [urlFile]="urlFile"
+                                [readOnly]="readOnly"
+                                [fileName]="internalFileName"
+                                [allowedEditActions]="allowedEditActions"
+                                [blobFile]="blobFile"
+                                (error)="onUnsupportedFile()"
+                                (submit)="onSubmitFile($event)"
+                                (imageLoaded)="isContentReady = true"
+                                (isSaving)="isSaving.emit($event)"
                 />
             </ng-container>
 
             <ng-container *ngSwitchCase="'media'">
-                <adf-media-player
-                    id="adf-mdedia-player"
-                    [urlFile]="urlFile"
-                    [tracks]="tracks"
-                    [mimeType]="mimeType"
-                    [blobFile]="blobFile"
-                    [fileName]="internalFileName"
-                    (error)="onUnsupportedFile()"
-                    (canPlay)="isContentReady = true"
-                />
+                <adf-media-player id="adf-mdedia-player"
+                                  [urlFile]="urlFile"
+                                  [tracks]="tracks"
+                                  [mimeType]="mimeType"
+                                  [blobFile]="blobFile"
+                                  [fileName]="internalFileName"
+                                  (error)="onUnsupportedFile()"
+                                  (canPlay)="isContentReady = true"/>
             </ng-container>
 
             <ng-container *ngSwitchCase="'text'">
-                <adf-txt-viewer [urlFile]="urlFile" [blobFile]="blobFile" />
+                <adf-txt-viewer [urlFile]="urlFile"
+                                [blobFile]="blobFile" />
             </ng-container>
 
             <ng-container *ngSwitchCase="'custom'">
                 <ng-container *ngFor="let ext of viewerExtensions">
-                    <adf-preview-extension
-                        *ngIf="checkExtensions(ext.fileExtension)"
-                        [id]="ext.component"
-                        [url]="urlFile"
-                        [extension]="extension"
-                        [nodeId]="nodeId"
-                        [attr.data-automation-id]="ext.component"
-                    />
+                    <adf-preview-extension *ngIf="checkExtensions(ext.fileExtension)"
+                                           [id]="ext.component"
+                                           [url]="urlFile"
+                                           [extension]="extension"
+                                           [nodeId]="nodeId"
+                                           [attr.data-automation-id]="ext.component" />
                 </ng-container>
 
                 <ng-container *ngFor="let extensionTemplate of extensionTemplates">
                     <span *ngIf="extensionTemplate.isVisible" class="adf-viewer-render-custom-content">
-                        <ng-template
-                            [ngTemplateOutlet]="extensionTemplate.template"
-                            [ngTemplateOutletContext]="{ urlFile: urlFile, extension: extension }"
-                        />
+                        <ng-template [ngTemplateOutlet]="extensionTemplate.template"
+                                     [ngTemplateOutletContext]="{ urlFile: urlFile, extension: extension }" />
                     </span>
                 </ng-container>
             </ng-container>
 
             <ng-container *ngSwitchDefault>
-                <adf-viewer-unknown-format [customError]="customError" />
+                <adf-viewer-unknown-format [customError]="customError"/>
             </ng-container>
         </div>
     </div>
diff --git a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.spec.ts b/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.spec.ts
index 1cd331ab72..f8b3aef4e0 100644
--- a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.spec.ts
+++ b/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.spec.ts
@@ -24,7 +24,7 @@ import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { NoopTranslateModule, UnitTestingUtils } from '../../../testing';
 import { RenderingQueueServices } from '../../services/rendering-queue.services';
 import { ViewerRenderComponent } from './viewer-render.component';
-import { ImgViewerComponent, MediaPlayerComponent, PdfViewerComponent, ViewerExtensionDirective } from '@alfresco/adf-core';
+import { ImgViewerComponent, MediaPlayerComponent, ViewerExtensionDirective } from '@alfresco/adf-core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 @Component({
@@ -504,23 +504,22 @@ describe('ViewerComponent', () => {
 
             expect(getMainLoader()).toBeNull();
             expect(component.viewerType).toBe('media');
-            expect(component.isContentReady).toBeTrue();
         });
 
-        it('should show spinner until content is ready when viewerType is pdf', () => {
+        // eslint-disable-next-line ban/ban
+        xit('should show spinner until content is ready when viewerType is pdf', () => {
             component.isLoading = false;
             component.urlFile = 'some-url.pdf';
-            expect(getMainLoader()).toBeNull();
 
             component.ngOnChanges();
             fixture.detectChanges();
 
-            const imgViewer = testingUtils.getByDirective(PdfViewerComponent);
-            imgViewer.triggerEventHandler('pagesLoaded', null);
+            expect(getMainLoader()).not.toBeNull();
+
             fixture.detectChanges();
 
+            expect(getMainLoader()).toBeNull();
             expect(component.viewerType).toBe('pdf');
-            expect(component.isContentReady).toBeTrue();
         });
 
         it('should show spinner until content is ready when viewerType is image', () => {
@@ -537,10 +536,9 @@ describe('ViewerComponent', () => {
 
             expect(getMainLoader()).toBeNull();
             expect(component.viewerType).toBe('image');
-            expect(component.isContentReady).toBeTrue();
         });
 
-        it('should not show spinner and set isContentReady = true for other viewer types different than media/pdf/image', () => {
+        it('should not show spinner when isLoading = false and isContentReady = false for other viewer types', () => {
             component.isLoading = false;
             component.urlFile = 'some-url.txt';
 
@@ -548,7 +546,7 @@ describe('ViewerComponent', () => {
             fixture.detectChanges();
 
             expect(getMainLoader()).toBeNull();
-            expect(component.isContentReady).toBeTrue();
+            expect(component.isContentReady).toBeFalse();
         });
     });
 });
diff --git a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.ts b/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.ts
index 725159123f..61b41fef69 100644
--- a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.ts
+++ b/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.ts
@@ -29,8 +29,6 @@ import { PdfViewerComponent } from '../pdf-viewer/pdf-viewer.component';
 import { TxtViewerComponent } from '../txt-viewer/txt-viewer.component';
 import { UnknownFormatComponent } from '../unknown-format/unknown-format.component';
 
-type ViewerType = 'media' | 'image' | 'pdf' | 'unknown';
-
 @Component({
     selector: 'adf-viewer-render',
     standalone: true,
@@ -143,7 +141,7 @@ export class ViewerRenderComponent implements OnChanges, OnInit {
     extensionsSupportedByTemplates: string[] = [];
     extension: string;
     internalFileName: string;
-    viewerType: ViewerType = 'unknown';
+    viewerType: string = 'unknown';
     isContentReady = false;
 
     /**
@@ -187,25 +185,19 @@ export class ViewerRenderComponent implements OnChanges, OnInit {
     }
 
     ngOnChanges() {
-        this.updateLoadingState();
+        this.isContentReady = false;
+        this.isLoading = !this.blobFile && !this.urlFile;
 
         if (this.blobFile) {
             this.setUpBlobData();
         } else if (this.urlFile) {
             this.setUpUrlFile();
         }
-
-        this.updateLoadingState();
-    }
-
-    private updateLoadingState() {
-        this.isContentReady = !(this.viewerType === 'media' || this.viewerType === 'pdf' || this.viewerType === 'image');
-        this.isLoading = !this.blobFile && !this.urlFile;
     }
 
     private setUpBlobData() {
         this.internalFileName = this.fileName;
-        this.viewerType = this.viewUtilService.getViewerTypeByMimeType(this.blobFile.type) as ViewerType;
+        this.viewerType = this.viewUtilService.getViewerTypeByMimeType(this.blobFile.type);
 
         this.extensionChange.emit(this.blobFile.type);
         this.scrollTop();
@@ -214,7 +206,7 @@ export class ViewerRenderComponent implements OnChanges, OnInit {
     private setUpUrlFile() {
         this.internalFileName = this.fileName ? this.fileName : this.viewUtilService.getFilenameFromUrl(this.urlFile);
         this.extension = this.viewUtilService.getFileExtension(this.internalFileName);
-        this.viewerType = this.viewUtilService.getViewerType(this.extension, this.mimeType, this.extensionsSupportedByTemplates) as ViewerType;
+        this.viewerType = this.viewUtilService.getViewerType(this.extension, this.mimeType, this.extensionsSupportedByTemplates);
 
         this.extensionChange.emit(this.extension);
         this.scrollTop();