diff --git a/packages/rocketchat-message-star/client/actionButton.js b/packages/rocketchat-message-star/client/actionButton.js
index 8b8a82e31c9..db1701e0987 100644
--- a/packages/rocketchat-message-star/client/actionButton.js
+++ b/packages/rocketchat-message-star/client/actionButton.js
@@ -18,7 +18,10 @@ Meteor.startup(function() {
 			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
 				return false;
 			}
-			return RocketChat.settings.get('Message_AllowStarring') && !message.starred;
+
+			const starred = _.findWhere(message.starred, {_id: Meteor.userId()});
+
+			return RocketChat.settings.get('Message_AllowStarring') && !starred;
 		},
 		order: 10
 	});
@@ -40,7 +43,10 @@ Meteor.startup(function() {
 			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
 				return false;
 			}
-			return RocketChat.settings.get('Message_AllowStarring') && message.starred;
+
+			const starred = _.findWhere(message.starred, {_id: Meteor.userId()});
+
+			return RocketChat.settings.get('Message_AllowStarring') && Boolean(starred);
 		},
 		order: 10
 	});