diff --git a/src/admininterface.cpp b/src/admininterface.cpp
index 3af032d4976ae9848ad0133f332cdc8428b32845..7df84772d6a642bdd67679f1d79675ef5fdaebbc 100644
--- a/src/admininterface.cpp
+++ b/src/admininterface.cpp
@@ -66,6 +66,11 @@ void AdminInterface::handleMessageReceived(Swift::Message::ref message) {
 		return;
 	}
 
+	// Ignore empty messages
+	if (message->getBody().empty()) {
+		return;
+	}
+
 	LOG4CXX_INFO(logger, "Message from admin received");
 	message->setTo(message->getFrom());
 	message->setFrom(m_component->getJID());