diff --git a/js/background.js b/js/background.js
index cc7659eca..b88e24c47 100644
--- a/js/background.js
+++ b/js/background.js
@@ -1900,6 +1900,12 @@
           }
         );
         conversation.set(newAttributes);
+      } else {
+        const { attributes } = conversation;
+        if (attributes.avatar && attributes.avatar.path) {
+          await deleteAttachmentData(attributes.avatar.path);
+        }
+        conversation.set({ avatar: null });
       }
 
       window.Signal.Data.updateConversation(id, conversation.attributes);