diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go
index 85864f3784..ca7575924a 100644
--- a/store/sqlstore/channel_store.go
+++ b/store/sqlstore/channel_store.go
@@ -3850,7 +3850,31 @@ func (s SqlChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId
 	defer finalizeTransactionX(transaction, &err)
 
 	channelMembers := []channelMember{}
-	if err := transaction.Select(&channelMembers, "SELECT * from ChannelMembers WHERE (ChannelId, UserId) > (?, ?) ORDER BY ChannelId, UserId LIMIT 100", fromChannelId, fromUserId); err != nil {
+	query := `
+		SELECT
+			ChannelId,
+			UserId,
+			Roles,
+			LastViewedAt,
+			MsgCount,
+			MentionCount,
+			MentionCountRoot,
+			COALESCE(UrgentMentionCount, 0) AS UrgentMentionCount,
+			MsgCountRoot,
+			NotifyProps,
+			LastUpdateAt,
+			SchemeUser,
+			SchemeAdmin,
+			SchemeGuest
+		FROM
+			ChannelMembers
+		WHERE
+			(ChannelId, UserId) > (?, ?)
+		ORDER BY ChannelId, UserId
+		LIMIT 100
+	`
+
+	if err := transaction.Select(&channelMembers, query, fromChannelId, fromUserId); err != nil {
 		return nil, errors.Wrap(err, "failed to find ChannelMembers")
 	}
 
@@ -3954,7 +3978,31 @@ func (s SqlChannelStore) ClearAllCustomRoleAssignments() (err error) {
 		}
 
 		channelMembers := []*channelMember{}
-		if err = transaction.Select(&channelMembers, "SELECT * from ChannelMembers WHERE (ChannelId, UserId) > (?, ?) ORDER BY ChannelId, UserId LIMIT 1000", lastChannelId, lastUserId); err != nil {
+		query := `
+			SELECT
+				ChannelId,
+				UserId,
+				Roles,
+				LastViewedAt,
+				MsgCount,
+				MentionCount,
+				MentionCountRoot,
+				COALESCE(UrgentMentionCount, 0) AS UrgentMentionCount,
+				MsgCountRoot,
+				NotifyProps,
+				LastUpdateAt,
+				SchemeUser,
+				SchemeAdmin,
+				SchemeGuest
+			FROM
+				ChannelMembers
+			WHERE
+				(ChannelId, UserId) > (?, ?)
+			ORDER BY ChannelId, UserId
+			LIMIT 1000
+		`
+
+		if err = transaction.Select(&channelMembers, query, lastChannelId, lastUserId); err != nil {
 			finalizeTransactionX(transaction, &err)
 			return errors.Wrap(err, "failed to find ChannelMembers")
 		}