diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index ebbfb2d1fdbe30382e9361c79cff0cf91b6cd73f..4342a214e2d5585cc73505368654a6f8081275f0 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -340,7 +340,7 @@ void UserManager::handleMessageReceived(Swift::Message::ref message) {
 		messageToBackendSent();
 	}
 
-	if (message->getBody().empty() && !statePayload) {
+	if (message->getBody().empty() && !statePayload && message->getSubject().empty()) {
 		return;
 	}