diff --git a/lib/core/karma.conf.js b/lib/core/karma.conf.js
index 4778058bfa..7dec2e578d 100644
--- a/lib/core/karma.conf.js
+++ b/lib/core/karma.conf.js
@@ -8,10 +8,8 @@ module.exports = function (config) {
     config.set({
         basePath: '../../',
         files: [
-            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.min.mjs', type: 'module', included: true, watched: false },
-            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.worker.min.mjs', type: 'module', included: true, watched: false },
-            { pattern: 'node_modules/pdfjs-dist/legacy/web/pdf_viewer.mjs', type: 'module', included: true, watched: false },
-
+            { pattern: 'node_modules/pdfjs-dist/build/pdf.min.mjs', type: 'module', included: true, watched: false },
+            { pattern: 'node_modules/pdfjs-dist/build/pdf.worker.min.mjs', type: 'module', included: true, watched: false },
             {
                 pattern: 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
                 included: true,
@@ -37,8 +35,8 @@ module.exports = function (config) {
         frameworks: ['jasmine-ajax', 'jasmine', '@angular-devkit/build-angular'],
 
         proxies: {
-            '/pdf.worker.min.mjs': '/base/node_modules/pdfjs-dist/legacy/build/pdf.min.mjs',
-            '/pdf.worker.js': '/base/node_modules/pdfjs-dist/legacy/build/pdf.worker.mjs',
+            '/pdf.worker.min.mjs': '/base/node_modules/pdfjs-dist/build/pdf.min.mjs',
+            '/pdf.worker.js': '/base/node_modules/pdfjs-dist/build/pdf.worker.mjs',
             '/fake-url-file.png': '/base/lib/core/src/lib/assets/images/logo.png',
             '/logo.png': '/base/lib/core/src/lib/assets/images/logo.png',
             '/alfresco-logo.svg': '/base/lib/core/src/lib/assets/images/alfresco-logo.svg',
diff --git a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts
index 1feae2689a..21f2b32623 100644
--- a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts
+++ b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts
@@ -45,9 +45,9 @@ import { ToolbarComponent, ToolbarDividerComponent } from '../../../toolbar';
 import { RenderingQueueServices } from '../../services/rendering-queue.services';
 import { PdfPasswordDialogComponent } from '../pdf-viewer-password-dialog/pdf-viewer-password-dialog';
 import { PdfThumbListComponent } from '../pdf-viewer-thumbnails/pdf-viewer-thumbnails.component';
+import { EventBus, PDFViewer } from 'pdfjs-dist/web/pdf_viewer.mjs';
 
 declare const pdfjsLib: any;
-declare const pdfjsViewer: any;
 
 export type PdfScaleMode = 'init' | 'page-actual' | 'page-width' | 'page-height' | 'page-fit' | 'auto';
 
@@ -129,7 +129,7 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
         return this.pdfViewer?.currentScaleValue ? Math.round(this.pdfViewer.currentScaleValue * 100) + '%' : '';
     }
 
-    private eventBus = new pdfjsViewer.EventBus();
+    private eventBus = new EventBus();
     private pdfjsDefaultOptions = {
         disableAutoFetch: true,
         disableStream: true,
@@ -248,7 +248,7 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
         const container = this.getDocumentContainer();
 
         if (viewer && container) {
-            this.pdfViewer = new pdfjsViewer.PDFViewer({
+            this.pdfViewer = new PDFViewer({
                 container,
                 viewer,
                 renderingQueue: this.renderingQueueServices,
@@ -281,11 +281,11 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
     ngOnDestroy() {
         if (this.pdfViewer) {
             // cspell: disable-next
-            this.eventBus.off('pagechanging');
+            this.eventBus.off('pagechanging', () => {});
             // cspell: disable-next
-            this.eventBus.off('pagesloaded');
+            this.eventBus.off('pagesloaded', () => {});
             // cspell: disable-next
-            this.eventBus.off('textlayerrendered');
+            this.eventBus.off('textlayerrendered', () => {});
         }
 
         if (this.loadingTask) {
@@ -382,8 +382,8 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
         return document.getElementById(`${this.randomPdfId}-viewer-main-container`);
     }
 
-    private getDocumentContainer(): HTMLElement {
-        return document.getElementById(`${this.randomPdfId}-viewer-pdf-viewer`);
+    private getDocumentContainer(): HTMLDivElement {
+        return document.getElementById(`${this.randomPdfId}-viewer-pdf-viewer`) as HTMLDivElement;
     }
 
     private getViewer(): HTMLElement {