diff --git a/packages/rocketchat-message-star/client/actionButton.js b/packages/rocketchat-message-star/client/actionButton.js
index 8b8a82e31c9f2..64faa7b24bad0 100644
--- a/packages/rocketchat-message-star/client/actionButton.js
+++ b/packages/rocketchat-message-star/client/actionButton.js
@@ -15,10 +15,11 @@ Meteor.startup(function() {
 			});
 		},
 		validation(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
+			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null && RocketChat.settings.get('Message_AllowStarring')) {
 				return false;
 			}
-			return RocketChat.settings.get('Message_AllowStarring') && !message.starred;
+
+			return !_.findWhere(message.starred, {_id: Meteor.userId()});
 		},
 		order: 10
 	});
@@ -37,10 +38,11 @@ Meteor.startup(function() {
 			});
 		},
 		validation(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
+			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null && RocketChat.settings.get('Message_AllowStarring')) {
 				return false;
 			}
-			return RocketChat.settings.get('Message_AllowStarring') && message.starred;
+
+			return Boolean(_.findWhere(message.starred, {_id: Meteor.userId()}));
 		},
 		order: 10
 	});