diff --git a/Whatsapp_Chat_Exporter/extract_iphone.py b/Whatsapp_Chat_Exporter/extract_iphone.py
index 1b0dea9..baa416b 100644
--- a/Whatsapp_Chat_Exporter/extract_iphone.py
+++ b/Whatsapp_Chat_Exporter/extract_iphone.py
@@ -62,9 +62,9 @@ def messages(db, data, media_folder):
             data[contact_id].their_avatar = avatars[0]
         else:
             for avatar in avatars:
-                if avatar.endswith(".thumb"):
+                if avatar.endswith(".thumb") and data[content["ZCONTACTJID"]].their_avatar_thumb is None:
                     data[contact_id].their_avatar_thumb = avatar
-                elif avatar.endswith(".jpg"):
+                elif avatar.endswith(".jpg") and data[content["ZCONTACTJID"]].their_avatar is None:
                     data[contact_id].their_avatar = avatar
         content = c.fetchone()