diff --git a/src/user.cpp b/src/user.cpp
index 9afab31af68f53b5f03c36c617c4398366129f91..301031b8cba910c94524823e5e5ef4eb41eb502c 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -258,6 +258,8 @@ void User::handlePresence(Swift::Presence::ref presence, bool forceJoin) {
 					delete conv;
 				}
 			}
+
+			return;
 		}
 		else if (isMUC) {
 			// force connection to legacy network to let backend to handle auto-join on connect.
@@ -315,8 +317,11 @@ void User::handlePresence(Swift::Presence::ref presence, bool forceJoin) {
 
 			onRawPresenceReceived(presence);
 			onRoomJoined(presence->getFrom(), room, presence->getTo().getResource(), password);
+
+			return;
 		}
-		return;
+
+		onRawPresenceReceived(presence);
 	}
 
 	int currentResourcesCount = m_presenceOracle->getAllPresence(m_jid).size();