diff --git a/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java b/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java
index 9d11721a9e..abbfc28921 100644
--- a/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java
+++ b/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java
@@ -309,7 +309,9 @@ else createAndSaveNewMessage(true, uid, resource, text, null, delay, true, notif
                 Occupant oldOccupant = occupants.get(resource);
                 Occupant newOccupant = createOccupant(resource, presence);
                 newOccupant.setJid(from);
-                occupants.put(resource, newOccupant);
+                if (newOccupant != null && newOccupant.getNickname() != null) {
+                    occupants.put(resource, newOccupant);
+                }
                 if (oldOccupant == null) {
                     onAvailable(resource);
                     RosterManager.onContactChanged(account, user);
@@ -623,4 +625,4 @@ protected void onDisconnect() {
         }
     }
 
-}
\ No newline at end of file
+}