diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index d1a826248df7c18dbefc3d26b5f6db54b28d0d77..b86f42cd1b4f071d146547948713dea44f3accd4 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -2059,6 +2059,7 @@ public class Conversation extends AbstractEntity
 
         @Override
         public void destroyItem(@NonNull ViewGroup container, int position, Object o) {
+            if (o == null) return;
             if (position < 2) {
                 container.removeView((View) o);
                 return;