diff --git a/packages/rocketchat-lib/server/models/Users.coffee b/packages/rocketchat-lib/server/models/Users.coffee
index 847a87e331b9..0c91521767d8 100644
--- a/packages/rocketchat-lib/server/models/Users.coffee
+++ b/packages/rocketchat-lib/server/models/Users.coffee
@@ -67,9 +67,9 @@ RocketChat.models.Users = new class extends RocketChat.models._Base
 
 		return @find query, options
 
-	findUsersByUsernamesWithHighlights: (username, options) ->
+	findUsersByUsernamesWithHighlights: (usernames, options) ->
 		query =
-			username: username
+			username: { $in: usernames }
 			'settings.preferences.highlights':
 				$exists: true