diff --git a/app/assets/javascripts/discourse/app/initializers/mobile.js b/app/assets/javascripts/discourse/app/initializers/mobile.js
index dbfbf18091..c0dbaa1954 100644
--- a/app/assets/javascripts/discourse/app/initializers/mobile.js
+++ b/app/assets/javascripts/discourse/app/initializers/mobile.js
@@ -1,5 +1,6 @@
 import Mobile from "discourse/lib/mobile";
 import { setResolverOption } from "discourse-common/resolver";
+import { setResolverOption as setLegacyResolverOption } from "discourse-common/lib/legacy-resolver";
 
 // Initializes the `Mobile` helper object.
 export default {
@@ -14,5 +15,6 @@ export default {
     site.set("isMobileDevice", Mobile.isMobileDevice);
 
     setResolverOption("mobileView", Mobile.mobileView);
+    setLegacyResolverOption("mobileView", Mobile.mobileView);
   },
 };
diff --git a/app/assets/javascripts/discourse/tests/helpers/component-test.js b/app/assets/javascripts/discourse/tests/helpers/component-test.js
index 4a4df22ee9..66658cd37c 100644
--- a/app/assets/javascripts/discourse/tests/helpers/component-test.js
+++ b/app/assets/javascripts/discourse/tests/helpers/component-test.js
@@ -7,7 +7,6 @@ import { autoLoadModules } from "discourse/initializers/auto-load-modules";
 import QUnit, { test } from "qunit";
 import { setupRenderingTest as emberSetupRenderingTest } from "ember-qunit";
 import { currentSettings } from "discourse/tests/helpers/site-settings";
-import { clearResolverOptions } from "discourse-common/resolver";
 import { testCleanup } from "discourse/tests/helpers/qunit-helpers";
 
 export function setupRenderingTest(hooks) {
@@ -22,7 +21,6 @@ export function setupRenderingTest(hooks) {
       }
 
       this.container = this.owner;
-      clearResolverOptions();
     }
 
     this.site = Site.current();
diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
index 734118f5f9..7ac52632ad 100644
--- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
+++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
@@ -47,6 +47,7 @@ import sinon from "sinon";
 import siteFixtures from "discourse/tests/fixtures/site-fixtures";
 import { clearExtraKeyboardShortcutHelp } from "discourse/lib/keyboard-shortcuts";
 import { clearResolverOptions } from "discourse-common/resolver";
+import { clearResolverOptions as clearLegacyResolverOptions } from "discourse-common/lib/legacy-resolver";
 import { clearNavItems } from "discourse/models/nav-item";
 import {
   cleanUpComposerUploadHandler,
@@ -192,6 +193,8 @@ export function testCleanup(container, app) {
   clearTagDecorateCallbacks();
   clearBlockDecorateCallbacks();
   clearTextDecorateCallbacks();
+  clearResolverOptions();
+  clearLegacyResolverOptions();
 }
 
 export function discourseModule(name, options) {
@@ -207,8 +210,8 @@ export function discourseModule(name, options) {
         this.registry = this.container.registry;
         this.owner = this.container;
         this.siteSettings = currentSettings();
-        clearResolverOptions();
       });
+
       hooks.afterEach(() => testCleanup(this.container));
 
       this.getController = function (controllerName, properties) {