diff --git a/app/assets/javascripts/discourse/app/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js
index 18648f9c316..3350c36cc6f 100644
--- a/app/assets/javascripts/discourse/app/models/nav-item.js
+++ b/app/assets/javascripts/discourse/app/models/nav-item.js
@@ -1,5 +1,6 @@
 import EmberObject from "@ember/object";
 import { reads } from "@ember/object/computed";
+import { inject as service } from "@ember/service";
 import { emojiUnescape } from "discourse/lib/text";
 import {
   hasTrackedFilter,
@@ -16,6 +17,8 @@ import discourseComputed from "discourse-common/utils/decorators";
 import I18n from "discourse-i18n";
 
 const NavItem = EmberObject.extend({
+  topicTrackingState: service(),
+
   @discourseComputed("name")
   title: {
     get(name) {
diff --git a/app/assets/javascripts/discourse/app/services/store.js b/app/assets/javascripts/discourse/app/services/store.js
index 18b9149acee..e0f06d8ac49 100644
--- a/app/assets/javascripts/discourse/app/services/store.js
+++ b/app/assets/javascripts/discourse/app/services/store.js
@@ -266,12 +266,6 @@ export default class StoreService extends Service {
     obj.__type = type;
     obj.__state = obj[adapter.primaryKey] ? "created" : "new";
 
-    // TODO: Have injections be automatic
-    obj.topicTrackingState = this.register.lookup(
-      "service:topic-tracking-state"
-    );
-    obj.keyValueStore = this.register.lookup("service:key-value-store");
-
     const klass = this.register.lookupFactory("model:" + type) || RestModel;
     const model = klass.create(obj);