diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index 86d771740..074432030 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -119,7 +119,7 @@ public final class Config {
     public static final boolean ONLY_INTERNAL_STORAGE = false; //use internal storage instead of sdcard to save attachments
 
     public static final boolean IGNORE_ID_REWRITE_IN_MUC = true;
-    public static final boolean MUC_LEAVE_BEFORE_JOIN = true;
+    public static final boolean MUC_LEAVE_BEFORE_JOIN = false;
 
     public static final boolean USE_LMC_VERSION_1_1 = true;