diff --git a/web/pdf_rendering_queue.js b/web/pdf_rendering_queue.js
index 94644df5717a2..60e885e225c4c 100644
--- a/web/pdf_rendering_queue.js
+++ b/web/pdf_rendering_queue.js
@@ -36,6 +36,12 @@ class PDFRenderingQueue {
     this.idleTimeout = null;
     this.printing = false;
     this.isThumbnailViewEnabled = false;
+
+    if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
+      Object.defineProperty(this, "hasViewer", {
+        value: () => !!this.pdfViewer,
+      });
+    }
   }
 
   /**
@@ -60,13 +66,6 @@ class PDFRenderingQueue {
     return this.highestPriorityPage === view.renderingId;
   }
 
-  /**
-   * @returns {boolean}
-   */
-  hasViewer() {
-    return !!this.pdfViewer;
-  }
-
   /**
    * @param {Object} currentlyVisiblePages
    */
diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js
index 14b18e3bebcb0..fdf3a429fd980 100644
--- a/web/pdf_viewer.js
+++ b/web/pdf_viewer.js
@@ -301,7 +301,10 @@ class PDFViewer {
     }
 
     this.defaultRenderingQueue = !options.renderingQueue;
-    if (this.defaultRenderingQueue) {
+    if (
+      (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) &&
+      this.defaultRenderingQueue
+    ) {
       // Custom rendering queue is not specified, using default one
       this.renderingQueue = new PDFRenderingQueue();
       this.renderingQueue.setViewer(this);