diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index 9a7f1d4aeef7b0988ec5671621d3f3a463443d9e..2f197b2b9fd113a5bc75d3c32fb17364f23084bc 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -577,7 +577,7 @@ void NetworkPluginServer::handleConvMessagePayload(const std::string &data, bool
 	}
 
 	// Add xhtml-im payload.
-	if (!payload.xhtml().empty()) {
+	if (CONFIG_BOOL(m_config, "service.enabled_xhtml") && !payload.xhtml().empty()) {
 		msg->addPayload(boost::make_shared<Swift::XHTMLIMPayload>(payload.xhtml()));
 	}