diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 9fb0db6d90ddba9233476e2a129fee522bc36958..ebbfb2d1fdbe30382e9361c79cff0cf91b6cd73f 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -334,7 +334,13 @@ void UserManager::handleMessageReceived(Swift::Message::ref message) {
 		return;
 	}
 
-	if (message->getBody().empty()) {
+	// Do not count chatstate notification...
+	boost::shared_ptr<Swift::ChatState> statePayload = message->getPayload<Swift::ChatState>();
+	if (!statePayload) {
+		messageToBackendSent();
+	}
+
+	if (message->getBody().empty() && !statePayload) {
 		return;
 	}
 
@@ -344,12 +350,6 @@ void UserManager::handleMessageReceived(Swift::Message::ref message) {
 	}
 
 	user->getConversationManager()->handleMessageReceived(message);
-
-	// Do not count chatstate notification...
-	boost::shared_ptr<Swift::ChatState> statePayload = message->getPayload<Swift::ChatState>();
-	if (!statePayload) {
-		messageToBackendSent();
-	}
 }
 
 void UserManager::handleGeneralPresenceReceived(Swift::Presence::ref presence) {