diff --git a/libtransport/UserManager.cpp b/libtransport/UserManager.cpp
index 44d9bd3cb28f7ca2360cb7ed48ab03a63cea4111..a7dc7335fdd83bce5afc5dcce6ca1e021c54b601 100644
--- a/libtransport/UserManager.cpp
+++ b/libtransport/UserManager.cpp
@@ -374,7 +374,12 @@ void UserManager::handleMessageReceived(Swift::Message::ref message) {
 		messageToBackendSent();
 	}
 
-	if (message->getBody().empty() && !statePayload && message->getSubject().empty()) {
+#if HAVE_SWIFTEN_3
+	std::string body = message->getBody().value_or("");
+#else
+	std::string body = message->getBody();
+#endif
+	if (body.empty() && !statePayload && message->getSubject().empty()) {
 		return;
 	}