diff --git a/web/app.js b/web/app.js
index 02436ff4a..8078c8be8 100644
--- a/web/app.js
+++ b/web/app.js
@@ -854,7 +854,13 @@ const PDFViewerApplication = {
     }
     if (isDataScheme(url)) {
       this._hideViewBookmark();
+    } else if (
+      typeof PDFJSDev !== "undefined" &&
+      PDFJSDev.test("MOZCENTRAL || CHROME")
+    ) {
+      AppOptions.set("docBaseUrl", this.baseUrl);
     }
+
     let title = getPdfFilenameFromUrl(url, "");
     if (!title) {
       try {
@@ -996,13 +1002,6 @@ const PDFViewerApplication = {
         /* downloadUrl = */ args.url
       );
     }
-    // Always set `docBaseUrl` in development mode, and in the (various)
-    // extension builds.
-    if (typeof PDFJSDev === "undefined") {
-      AppOptions.set("docBaseUrl", document.URL.split("#", 1)[0]);
-    } else if (PDFJSDev.test("MOZCENTRAL || CHROME")) {
-      AppOptions.set("docBaseUrl", this.baseUrl);
-    }
 
     // Set the necessary API parameters, using all the available options.
     const apiParams = AppOptions.getAll(OptionKind.API);
diff --git a/web/app_options.js b/web/app_options.js
index 001fa72dd..66b36361e 100644
--- a/web/app_options.js
+++ b/web/app_options.js
@@ -345,7 +345,7 @@ const defaultOptions = {
   },
   docBaseUrl: {
     /** @type {string} */
-    value: "",
+    value: typeof PDFJSDev === "undefined" ? document.URL.split("#", 1)[0] : "",
     kind: OptionKind.API,
   },
   enableHWA: {