diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 101627616b03b0198c7af26a0300994e5d04f132..ff4bb6ddf941cfb1093737f3ba54feda7134dc3c 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -312,6 +312,10 @@ void UserManager::handleMessageReceived(Swift::Message::ref message) {
 		return;
 	}
 
+	if (message->getBody().empty()) {
+		return;
+	}
+
 	User *user = getUser(message->getFrom().toBare().toString());
 	if (!user){
 		return;