diff --git a/include/Swiften/Serializer/PayloadSerializers/StatsSerializer.cpp b/include/Swiften/Serializer/PayloadSerializers/StatsSerializer.cpp
index e670a6ee..3675550f 100644
--- a/include/Swiften/Serializer/PayloadSerializers/StatsSerializer.cpp
+++ b/include/Swiften/Serializer/PayloadSerializers/StatsSerializer.cpp
@@ -23,8 +23,12 @@ std::string StatsSerializer::serializePayload(boost::shared_ptr<StatsPayload> st
 	foreach(const StatsPayload::Item& item, stats->getItems()) {
 		boost::shared_ptr<XMLElement> statElement(new XMLElement("stat"));
 		statElement->setAttribute("name", item.getName());
-		statElement->setAttribute("units", item.getUnits());
-		statElement->setAttribute("value", item.getValue());
+		if (!item.getUnits().empty()) {
+			statElement->setAttribute("units", item.getUnits());
+		}
+		if (!item.getUnits().empty()) {
+			statElement->setAttribute("value", item.getUnits());
+		}
 
 		queryElement.addNode(statElement);
 	}