diff --git a/ts/components/conversation/conversation-details/EditConversationAttributesModal.tsx b/ts/components/conversation/conversation-details/EditConversationAttributesModal.tsx
index b628ac2a3..e1a55c510 100644
--- a/ts/components/conversation/conversation-details/EditConversationAttributesModal.tsx
+++ b/ts/components/conversation/conversation-details/EditConversationAttributesModal.tsx
@@ -204,7 +204,8 @@ export const EditConversationAttributesModal: FunctionComponent<PropsType> = ({
     );
   }
 
-  const modalFooter = (
+  // AvatarEditor brings its own footer with it so no need to duplicate it.
+  const modalFooter = editingAvatar ? undefined : (
     <>
       <Button
         disabled={isRequestActive}