diff --git a/web/app.js b/web/app.js
index 5ebe75555..8b4e6265e 100644
--- a/web/app.js
+++ b/web/app.js
@@ -1795,10 +1795,17 @@ const PDFViewerApplication = {
     this.pdfViewer.cleanup();
     this.pdfThumbnailViewer.cleanup();
 
-    // We don't want to remove fonts used by active page SVGs.
-    this.pdfDocument.cleanup(
-      /* keepLoadedFonts = */ this.pdfViewer.renderer === RendererType.SVG
-    );
+    if (
+      typeof PDFJSDev === "undefined" ||
+      PDFJSDev.test("!PRODUCTION || GENERIC")
+    ) {
+      // We don't want to remove fonts used by active page SVGs.
+      this.pdfDocument.cleanup(
+        /* keepLoadedFonts = */ this.pdfViewer.renderer === RendererType.SVG
+      );
+    } else {
+      this.pdfDocument.cleanup();
+    }
   },
 
   forceRendering() {
diff --git a/web/pdf_page_view.js b/web/pdf_page_view.js
index 8b7776450..82d0bbf9e 100644
--- a/web/pdf_page_view.js
+++ b/web/pdf_page_view.js
@@ -344,7 +344,11 @@ class PDFPageView {
       }
       this._resetZoomLayer();
     }
-    if (this.svg) {
+    if (
+      (typeof PDFJSDev === "undefined" ||
+        PDFJSDev.test("!PRODUCTION || GENERIC")) &&
+      this.svg
+    ) {
       this.paintedViewportMap.delete(this.svg);
       delete this.svg;
     }
@@ -380,7 +384,11 @@ class PDFPageView {
       docStyle.setProperty("--scale-factor", this.viewport.scale);
     }
 
-    if (this.svg) {
+    if (
+      (typeof PDFJSDev === "undefined" ||
+        PDFJSDev.test("!PRODUCTION || GENERIC")) &&
+      this.svg
+    ) {
       this.cssTransform({
         target: this.svg,
         redrawAnnotationLayer: true,
@@ -733,6 +741,8 @@ class PDFPageView {
     };
 
     const paintTask =
+      (typeof PDFJSDev === "undefined" ||
+        PDFJSDev.test("!PRODUCTION || GENERIC")) &&
       this.renderer === RendererType.SVG
         ? this.paintOnSvg(canvasWrapper)
         : this.paintOnCanvas(canvasWrapper);