diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index d7708b52..80369bbf 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -607,12 +607,15 @@ public class ConversationActivity extends XmppActivity {
 
 	protected ConversationFragment swapConversationFragment() {
 		ConversationFragment selectedFragment = new ConversationFragment();
+		if (!isFinishing()) {
 
 		FragmentTransaction transaction = getFragmentManager()
 				.beginTransaction();
 		transaction.replace(R.id.selected_conversation, selectedFragment,
 				"conversation");
-		transaction.commitAllowingStateLoss();
+		
+			transaction.commitAllowingStateLoss();
+		}
 		return selectedFragment;
 	}