diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
index 78d725508..92e8ec3f3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
@@ -211,13 +211,15 @@ public class MultiUserChat {
 
                 switch (presence.getType()) {
                 case available:
-                    Presence oldPresence = occupantsMap.put(from, presence);
                     if (mucUser.getStatus().contains(MUCUser.Status.PRESENCE_TO_SELF_110)) {
                         processedReflectedSelfPresence = true;
                         synchronized (this) {
                             notify();
                         }
-                    } else if (oldPresence != null) {
+                    }
+
+                    Presence oldPresence = occupantsMap.put(from, presence);
+                    if (oldPresence != null) {
                         // Get the previous occupant's affiliation & role
                         MUCUser mucExtension = MUCUser.from(oldPresence);
                         MUCAffiliation oldAffiliation = mucExtension.getItem().getAffiliation();