diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 5f79edab0e0ce6f23b6642799ac55613137e4270..00643d6ddc05d504f97dcda0cfcdf41ef708e50c 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1494,7 +1494,11 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
             }
 
             ConversationPage session = sessions.get(position-2);
-            container.addView(session.inflateUi(container.getContext(), (s) -> removeSession(s)));
+            View v = session.inflateUi(container.getContext(), (s) -> removeSession(s));
+            if (v != null && v.getParent() != null) {
+                ((ViewGroup) v.getParent()).removeView(v);
+            }
+            container.addView(v);
             return session;
         }