diff --git a/libervia/backend/plugins/plugin_xep_0277.py b/libervia/backend/plugins/plugin_xep_0277.py
index ae17ec5d..d9edaa15 100644
--- a/libervia/backend/plugins/plugin_xep_0277.py
+++ b/libervia/backend/plugins/plugin_xep_0277.py
@@ -992,7 +992,10 @@ class XEP_0277(object):
             or data.get('content_rich')
             or ''
         )
-        return f"{id_base}-{token_urlsafe(3)}"
+        if not data.get("user_friendly_id_suffix", True):
+            return id_base
+        else:
+            return f"{id_base}-{token_urlsafe(3)}"
 
     def _mb_send(self, service, node, data, profile_key):
         service = jid.JID(service) if service else None