diff --git a/assets/javascripts/discourse-user-notes/connectors/after-reviewable-post-user/show-user-notes-on-flags.js.es6 b/assets/javascripts/discourse-user-notes/connectors/after-reviewable-post-user/show-user-notes-on-flags.js.es6
index e8bde4b..949a0a1 100644
--- a/assets/javascripts/discourse-user-notes/connectors/after-reviewable-post-user/show-user-notes-on-flags.js.es6
+++ b/assets/javascripts/discourse-user-notes/connectors/after-reviewable-post-user/show-user-notes-on-flags.js.es6
@@ -21,7 +21,7 @@ export default {
 
   actions: {
     showUserNotes() {
-      const store = getOwner(this).lookup("store:main");
+      const store = getOwner(this).lookup("service:store");
       const user = this.get("args.user");
       showUserNotes(store, user.id, (count) =>
         this.set("userNotesCount", count)
diff --git a/assets/javascripts/discourse-user-notes/connectors/user-card-post-names/show-user-notes-on-card.js.es6 b/assets/javascripts/discourse-user-notes/connectors/user-card-post-names/show-user-notes-on-card.js.es6
index 2894f92..6f3e14c 100644
--- a/assets/javascripts/discourse-user-notes/connectors/user-card-post-names/show-user-notes-on-card.js.es6
+++ b/assets/javascripts/discourse-user-notes/connectors/user-card-post-names/show-user-notes-on-card.js.es6
@@ -25,7 +25,7 @@ export default {
   actions: {
     showUserNotes() {
       this.parentView.parentView._close();
-      const store = getOwner(this).lookup("store:main");
+      const store = getOwner(this).lookup("service:store");
       const user = this.get("args.user");
       showUserNotes(store, user.id, (count) => {
         if (this.isDestroying || this.isDestroyed) {
diff --git a/assets/javascripts/discourse-user-notes/connectors/user-profile-controls/show-notes-on-profile.js.es6 b/assets/javascripts/discourse-user-notes/connectors/user-profile-controls/show-notes-on-profile.js.es6
index b9c837d..535df7d 100644
--- a/assets/javascripts/discourse-user-notes/connectors/user-profile-controls/show-notes-on-profile.js.es6
+++ b/assets/javascripts/discourse-user-notes/connectors/user-profile-controls/show-notes-on-profile.js.es6
@@ -17,7 +17,7 @@ export default {
 
   actions: {
     showUserNotes() {
-      const store = getOwner(this).lookup("store:main");
+      const store = getOwner(this).lookup("service:store");
       const user = this.get("args.model");
       showUserNotes(store, user.id, (count) =>
         this.set("userNotesCount", count)
diff --git a/assets/javascripts/discourse/initializers/enable-user-notes.js.es6 b/assets/javascripts/discourse/initializers/enable-user-notes.js.es6
index 5143c17..703f89a 100644
--- a/assets/javascripts/discourse/initializers/enable-user-notes.js.es6
+++ b/assets/javascripts/discourse/initializers/enable-user-notes.js.es6
@@ -18,7 +18,7 @@ export default {
       return;
     }
 
-    const store = container.lookup("store:main");
+    const store = container.lookup("service:store");
     withPluginApi("0.8.15", (api) => {
       function widgetshowUserNotes() {
         showUserNotes(