diff --git a/portal.go b/portal.go
index 510e954..4169118 100644
--- a/portal.go
+++ b/portal.go
@@ -414,7 +414,7 @@ func (portal *Portal) SyncParticipants(metadata *whatsappExt.GroupInfo) {
 }
 
 func (portal *Portal) UpdateAvatar(user *User, avatar *whatsappExt.ProfilePicInfo, updateInfo bool) bool {
-	if avatar == nil {
+	if avatar == nil || (avatar.Status == 0 && avatar.Tag != "remove" && len(avatar.URL) == 0) {
 		var err error
 		avatar, err = user.Conn.GetProfilePicThumb(portal.Key.JID)
 		if err != nil {
diff --git a/user.go b/user.go
index ec9b016..541f332 100644
--- a/user.go
+++ b/user.go
@@ -1090,7 +1090,7 @@ func (user *User) HandleCommand(cmd whatsappExt.Command) {
 		if strings.HasSuffix(cmd.JID, whatsappExt.NewUserSuffix) {
 			puppet := user.bridge.GetPuppetByJID(cmd.JID)
 			go puppet.UpdateAvatar(user, cmd.ProfilePicInfo)
-		} else {
+		} else if user.bridge.Config.Bridge.ChatMetaSync {
 			portal := user.GetPortalByJID(cmd.JID)
 			go portal.UpdateAvatar(user, cmd.ProfilePicInfo, true)
 		}