diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index 4ff129e99de9a4232d441d2825895c4989b7085b..50f9e193424ad0ffc0d8191d4d006dd0961fd384 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -3180,6 +3180,12 @@ uint64_t
 JamiAccount::sendTextMessage(const std::string& to,
                              const std::map<std::string, std::string>& payloads)
 {
+    Uri uri(to);
+    if (uri.scheme() == Uri::Scheme::SWARM) {
+        sendInstantMessage(uri.authority(), payloads);
+        return 0;
+    }
+
     std::string toUri;
     try {
         toUri = parseJamiUri(to);