diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index c61ff526b847cec6281dc2c45955cf9adff72618..da90b36ede08ef497a29ed8158d8e0db869cd956 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -3203,8 +3203,8 @@ JamiAccount::sendMessage(const std::string& to,
             if (!id.empty()) {
                 payload_type += "/" + id;
             }
-            return payload_type;
         }
+        return payload_type;
     };
 
     if (deviceId.empty()) {