diff --git a/libtransport/NetworkPluginServer.cpp b/libtransport/NetworkPluginServer.cpp
index 99228c41ad1465500dc7caf3a632c24f2cdfc37c..d2dad5f04d98007467161be06550ac09c810fb89 100644
--- a/libtransport/NetworkPluginServer.cpp
+++ b/libtransport/NetworkPluginServer.cpp
@@ -1103,6 +1103,10 @@ void NetworkPluginServer::handleRawXML(const std::string &xml) {
 }
 
 void NetworkPluginServer::handleRawPresenceReceived(boost::shared_ptr<Swift::Presence> presence) {
+	if (!CONFIG_BOOL_DEFAULTED(m_config, "features.rawxml", false)) {
+		return;
+	}
+
 	User *user = m_userManager->getUser(presence->getFrom().toBare());
 	if (!user)
 		return;