diff --git a/app/assets/javascripts/discourse/app/lib/mobile.js b/app/assets/javascripts/discourse/app/lib/mobile.js
index 27b1c22b71..e23c58c162 100644
--- a/app/assets/javascripts/discourse/app/lib/mobile.js
+++ b/app/assets/javascripts/discourse/app/lib/mobile.js
@@ -2,12 +2,12 @@ import { getOwner } from "discourse-common/lib/get-owner";
 import deprecated from "discourse-common/lib/deprecated";
 
 deprecated(
-  "`discourse/lib/mobile` import is deprecated. Use `isMobileDevice`, `mobileView`, properties and `toggleMobileView` method on `site:service`."
+  "`discourse/lib/mobile` import is deprecated. Use `isMobileDevice`, `mobileView`, properties and `toggleMobileView` method on `service:site`."
 );
 
 function site() {
   // Use the "default owner"
-  return getOwner().lookup("site:service");
+  return getOwner().lookup("service:site");
 }
 
 const Mobile = {
diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
index 7d4653f7ad..ce12ccd887 100644
--- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
+++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
@@ -308,12 +308,13 @@ export function acceptance(name, optionsOrCallback) {
       }
       this.siteSettings = currentSettings();
 
-      resetSite(currentSettings(), siteChanges);
-
       if (mobileView) {
-        Site.current().mobileView = true;
+        siteChanges ||= {};
+        siteChanges.mobileView = true;
       }
 
+      resetSite(currentSettings(), siteChanges);
+
       this.container = getOwner(this);
 
       if (!this.owner) {