diff --git a/libtransport/User.cpp b/libtransport/User.cpp
index dee06fe457724ab7506f28ca5ddf59ff678c6527..e8dbacfa2b7e8305d56c52b483b61b59c5ce6f7c 100644
--- a/libtransport/User.cpp
+++ b/libtransport/User.cpp
@@ -292,6 +292,10 @@ void User::handlePresence(Swift::Presence::ref presence, bool forceJoin) {
 			conv->setNickname(presence->getTo().getResource());
 			conv->addJID(presence->getFrom());
 
+			if (presence->getTo().toString().find("\\40") != std::string::npos) {
+				conv->setMUCEscaping(true);
+			}
+
 			onRawPresenceReceived(presence);
 			onRoomJoined(presence->getFrom(), room, presence->getTo().getResource(), password);