diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index ffefe5d3f..a85ca6b04 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -95,11 +95,8 @@ export default {
       this.item = item
     },
     updateState(id) {
-      this.pendingCreations.find((value) => {
-        value.state = 'IN_PROGRESS'
-        value.messageCount = value.messageCount + 1
-        return null
-      })
+      this.pendingCreations.find((obj) => obj.id === id).state = 'IN_PROGRESS'
+      this.pendingCreations.find((obj) => obj.id === id).obj.messagesCount++
     },
   },
   computed: {
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 03f025d51..3fd20a5c4 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -52,7 +52,7 @@
             >
               <b-icon icon="trash" class="h2"></b-icon>
             </div>
-            <div v-if="messages.length" class="pointer">
+            <div v-if="messagesCount > 0" class="pointer">
               <b-icon
                 v-b-toggle="collapsId"
                 icon="chat-dots"
@@ -62,7 +62,7 @@
             </div>
           </div>
         </div>
-        <div v-if="messages">
+        <div v-if="messagesCount > 0">
           <b-button
             v-if="state === 'IN_PROGRESS'"
             v-b-toggle="collapsId"
@@ -136,12 +136,9 @@ export default {
       type: String,
       required: false,
     },
-    messages: {
-      type: Array,
+    messagesCount: {
+      type: Number,
       required: false,
-      default() {
-        return []
-      },
     },
     contributionId: {
       type: Number,
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index d7fc0ce98..07b016d0a 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -207,15 +207,7 @@ export const listContributions = gql`
         confirmedBy
         deletedAt
         state
-        messages {
-          id
-          message
-          createdAt
-          updatedAt
-          type
-          userFirstName
-          userLastName
-        }
+        messagesCount
       }
     }
   }