diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt
index d030e5bb7b..2c94f4243c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt
@@ -813,6 +813,13 @@ class GroupManagerV2Impl @Inject constructor(
             )
         }
 
+        // Clear all messages we have from the group
+        val threadId = storage.getThreadId(Address.fromSerialized(groupId.hexString))
+        if (threadId != null) {
+            storage.clearMessages(threadId)
+        }
+
+        // Insert a message to indicate we were kicked
         storage.insertIncomingInfoMessage(
             context = application,
             senderPublicKey = userId,