diff --git a/services/sharedchannel/sync_send_remote.go b/services/sharedchannel/sync_send_remote.go
index 0db2250da9..d6efd49abf 100644
--- a/services/sharedchannel/sync_send_remote.go
+++ b/services/sharedchannel/sync_send_remote.go
@@ -296,11 +296,11 @@ func (scs *Service) fetchPostUsersForSync(sd *syncData) error {
 		}
 
 		if sync {
-			sd.users[user.Id] = sanitizeUserForSync(user)
+			sd.users[user.Id] = user
 		}
 
 		if syncImage {
-			sd.profileImages[user.Id] = sanitizeUserForSync(user)
+			sd.profileImages[user.Id] = user
 		}
 
 		// if this was a mention then put the real username in place of the username+remotename, but only
@@ -369,6 +369,8 @@ func (scs *Service) filterPostsForSync(sd *syncData) {
 func (scs *Service) sendSyncData(sd *syncData) error {
 	merr := merror.New()
 
+	sanitizeSyncData(sd)
+
 	// send users
 	if len(sd.users) != 0 {
 		if err := scs.sendUserSyncData(sd); err != nil {
@@ -531,3 +533,12 @@ func (scs *Service) sendSyncMsgToRemote(msg *syncMsg, rc *model.RemoteCluster, f
 	wg.Wait()
 	return err
 }
+
+func sanitizeSyncData(sd *syncData) {
+	for id, user := range sd.users {
+		sd.users[id] = sanitizeUserForSync(user)
+	}
+	for id, user := range sd.profileImages {
+		sd.profileImages[id] = sanitizeUserForSync(user)
+	}
+}