diff --git a/web/app.js b/web/app.js
index 5b13358e5..390ebd426 100644
--- a/web/app.js
+++ b/web/app.js
@@ -521,7 +521,11 @@ const PDFViewerApplication = {
       findController,
       scriptingManager:
         AppOptions.get("enableScripting") && pdfScriptingManager,
-      renderer: AppOptions.get("renderer"),
+      renderer:
+        typeof PDFJSDev === "undefined" ||
+        PDFJSDev.test("!PRODUCTION || GENERIC")
+          ? AppOptions.get("renderer")
+          : null,
       l10n: this.l10n,
       textLayerMode: AppOptions.get("textLayerMode"),
       annotationMode: AppOptions.get("annotationMode"),
diff --git a/web/app_options.js b/web/app_options.js
index d75277c56..0e744e059 100644
--- a/web/app_options.js
+++ b/web/app_options.js
@@ -160,11 +160,6 @@ const defaultOptions = {
     value: 150,
     kind: OptionKind.VIEWER,
   },
-  renderer: {
-    /** @type {string} */
-    value: "canvas",
-    kind: OptionKind.VIEWER,
-  },
   sidebarViewOnLoad: {
     /** @type {number} */
     value: -1,
@@ -306,6 +301,11 @@ if (
     value: navigator.language || "en-US",
     kind: OptionKind.VIEWER,
   };
+  defaultOptions.renderer = {
+    /** @type {string} */
+    value: "canvas",
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE,
+  };
   defaultOptions.sandboxBundleSrc = {
     /** @type {string} */
     value:
@@ -317,8 +317,6 @@ if (
 
   defaultOptions.annotationEditorEnabled.compatibility =
     compatibilityParams.annotationEditorEnabled;
-
-  defaultOptions.renderer.kind += OptionKind.PREFERENCE;
 } else if (PDFJSDev.test("CHROME")) {
   defaultOptions.disableTelemetry = {
     /** @type {boolean} */
diff --git a/web/pdf_page_view.js b/web/pdf_page_view.js
index 1bf374595..2c77dd84d 100644
--- a/web/pdf_page_view.js
+++ b/web/pdf_page_view.js
@@ -926,18 +926,13 @@ class PDFPageView {
 
   paintOnSvg(wrapper) {
     if (
-      typeof PDFJSDev !== "undefined" &&
-      PDFJSDev.test("MOZCENTRAL || CHROME")
+      !(
+        typeof PDFJSDev === "undefined" ||
+        PDFJSDev.test("!PRODUCTION || GENERIC")
+      )
     ) {
-      // Return a mock object, to prevent errors such as e.g.
-      // "TypeError: paintTask.promise is undefined".
-      return {
-        promise: Promise.reject(new Error("SVG rendering is not supported.")),
-        onRenderContinue(cont) {},
-        cancel() {},
-      };
+      throw new Error("Not implemented: paintOnSvg");
     }
-
     let cancelled = false;
     const ensureNotCancelled = () => {
       if (cancelled) {