diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 084ce9fe26b..08eeff71bfe 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -656,7 +656,7 @@ export default {
 				await this.getReactions()
 			}
 			// Check if current user has already added this reaction to the message
-			const currentUserHasReacted = this.$store.getters.userHasReacted(this.actorId, this.token, this.id, clickedEmoji)
+			const currentUserHasReacted = this.$store.getters.userHasReacted(this.$store.getters.getActorType(), this.$store.getters.getActorId(), this.token, this.id, clickedEmoji)
 
 			if (!currentUserHasReacted) {
 				this.$store.dispatch('addReactionToMessage', {
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index 04b86d19df7..88946fa8e2a 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -404,7 +404,7 @@ export default {
 
 		handleReactionClick(selectedEmoji) {
 			// Add reaction only if user hasn't reacted yet
-			if (!this.$store.getters.userHasReacted(this.actorId, this.token, this.messageObject.id, selectedEmoji)) {
+			if (!this.$store.getters.userHasReacted(this.$store.getters.getActorType(), this.$store.getters.getActorId(), this.token, this.messageObject.id, selectedEmoji)) {
 				this.$store.dispatch('addReactionToMessage', {
 					token: this.token,
 					messageId: this.messageObject.id,
diff --git a/src/store/reactionsStore.js b/src/store/reactionsStore.js
index 821e6c60aba..c9f1c67fc34 100644
--- a/src/store/reactionsStore.js
+++ b/src/store/reactionsStore.js
@@ -42,12 +42,12 @@ const getters = {
 	},
 
 	// Checks if a user has already reacted to a message with a particular reaction
-	userHasReacted: (state) => (actorId, token, messageId, reaction) => {
+	userHasReacted: (state) => (actorType, actorId, token, messageId, reaction) => {
 		if (!state?.reactions?.[token]?.[messageId]?.[reaction]) {
 			return false
 		}
 		return state?.reactions?.[token]?.[messageId]?.[reaction].filter(item => {
-			return item.actorId === actorId
+			return item.actorType === actorType && item.actorId === actorId
 		}).length !== 0
 	},
 }