diff --git a/addons/api/addon/services/store.js b/addons/api/addon/services/store.js
new file mode 100644
index 000000000..44dd57af1
--- /dev/null
+++ b/addons/api/addon/services/store.js
@@ -0,0 +1,14 @@
+import Store, { CacheHandler } from '@ember-data/store';
+import RequestManager from '@ember-data/request';
+import { LegacyNetworkHandler } from '@ember-data/legacy-compat';
+
+export default class extends Store {
+  requestManager = new RequestManager();
+
+  constructor(args) {
+    super(args);
+
+    this.requestManager.use([LegacyNetworkHandler]);
+    this.requestManager.useCache(CacheHandler);
+  }
+}
diff --git a/addons/api/app/services/store.js b/addons/api/app/services/store.js
new file mode 100644
index 000000000..0eeebf410
--- /dev/null
+++ b/addons/api/app/services/store.js
@@ -0,0 +1 @@
+export { default } from 'api/services/store';
diff --git a/addons/api/package.json b/addons/api/package.json
index 147e39ede..f839ab4cc 100644
--- a/addons/api/package.json
+++ b/addons/api/package.json
@@ -23,6 +23,7 @@
     "doc:toc": "doctoc README.md"
   },
   "dependencies": {
+    "ember-auto-import": "^2.6.3",
     "ember-can": "^4.2.0",
     "ember-cli-babel": "^7.26.10",
     "ember-cli-htmlbars": "^6.2.0",
diff --git a/addons/api/tests/unit/services/store-test.js b/addons/api/tests/unit/services/store-test.js
new file mode 100644
index 000000000..f1fb11741
--- /dev/null
+++ b/addons/api/tests/unit/services/store-test.js
@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'dummy/tests/helpers';
+
+module('Unit | Service | store', function (hooks) {
+  setupTest(hooks);
+
+  // TODO: Replace this with your real tests.
+  test('it exists', function (assert) {
+    let service = this.owner.lookup('service:store');
+    assert.ok(service);
+  });
+});
diff --git a/ui/admin/ember-cli-build.js b/ui/admin/ember-cli-build.js
index 82ed5e38e..92e93617f 100644
--- a/ui/admin/ember-cli-build.js
+++ b/ui/admin/ember-cli-build.js
@@ -33,6 +33,10 @@ module.exports = function (defaults) {
         },
       },
     },
+    // TODO: Update to 4.12 when deprecations are resolved
+    emberData: {
+      compatWith: '4.4',
+    },
   });
 
   // Only import when in development or test mode
diff --git a/ui/desktop/app/routes/application.js b/ui/desktop/app/routes/application.js
index ccb490188..a5685419e 100644
--- a/ui/desktop/app/routes/application.js
+++ b/ui/desktop/app/routes/application.js
@@ -35,7 +35,7 @@ export default class ApplicationRoute extends Route {
     await this.session.setup();
     const theme = this.session.get('data.theme');
     this.toggleTheme(theme);
-    return this.clusterUrl.updateClusterUrl();
+    await this.clusterUrl.updateClusterUrl();
   }
 
   /**
diff --git a/ui/desktop/app/routes/scopes/scope/authenticate.js b/ui/desktop/app/routes/scopes/scope/authenticate.js
index 3805f6160..e1524c814 100644
--- a/ui/desktop/app/routes/scopes/scope/authenticate.js
+++ b/ui/desktop/app/routes/scopes/scope/authenticate.js
@@ -18,8 +18,9 @@ export default class ScopesScopeAuthenticateRoute extends Route {
   // =methods
 
   beforeModel() {
-    if (this.session.isAuthenticated)
+    if (this.session.isAuthenticated) {
       this.router.replaceWith('scopes.scope.index');
+    }
   }
 
   /**