diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 7ee0134ac..fa5bdd940 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="contribution-messages-list-item">
-    <is-moderator v-if="isModerator" :message="message"></is-moderator>
+    <is-moderator v-if="message.isModerator" :message="message"></is-moderator>
     <is-not-moderator v-else :message="message"></is-not-moderator>
   </div>
 </template>
@@ -23,10 +23,5 @@ export default {
       },
     },
   },
-  computed: {
-    isModerator() {
-      return this.$store.state.moderator.id === this.message.userId
-    },
-  },
 }
 </script>
diff --git a/admin/src/graphql/listContributionMessages.js b/admin/src/graphql/listContributionMessages.js
index 2ae5943fa..c3ffdb0b9 100644
--- a/admin/src/graphql/listContributionMessages.js
+++ b/admin/src/graphql/listContributionMessages.js
@@ -18,6 +18,7 @@ export const listContributionMessages = gql`
         userFirstName
         userLastName
         userId
+        isModerator
       }
     }
   }