diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 065b6ee47..beb9612d1 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -190,6 +190,8 @@ public class MucOptions {
 								this.onJoinListener.onSuccess();
 								this.onJoinListener = null;
 							}
+						} else if (packet.getFrom().equals(this.conversation.getContactJid())) {
+							self = user;
 						} else {
 							addUser(user);
 						}