diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 40a8497d78..4b4c5b18bd 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -3153,6 +3153,10 @@ export class ConversationModel extends window.Backbone
 
     this.trigger('newmessage', model);
     this.updateUnread();
+
+    if (this.get('isArchived')) {
+      this.setArchived(false);
+    }
   }
 
   /**