diff --git a/xmpp/ChangeLog b/xmpp/ChangeLog
index 44b073b2d705f41005c1adabf8ba11c829430da3..3d284dcfa8da2b4972ff739eac1bb847b3eb2562 100644
--- a/xmpp/ChangeLog
+++ b/xmpp/ChangeLog
@@ -1,3 +1,8 @@
+Version NEXT
+XXXX-YY-ZZ [ RELEASER <admin@localhost> ]
+    * Fixes:
+      - Use tokio::sync::RwLock not std::sync::RwLock (!432)
+
 Version 0.6.0:
 2024-07-27 [ Maxime “pep” Buquet <pep@bouah.net> ]
     * Breaking:
diff --git a/xmpp/src/agent.rs b/xmpp/src/agent.rs
index 48d39cf367f906771052b3ef7aeb57821bff3d22..b172aff66739997c5175ba07b4b32a9e9f57afcc 100644
--- a/xmpp/src/agent.rs
+++ b/xmpp/src/agent.rs
@@ -5,7 +5,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 use std::path::{Path, PathBuf};
-use std::sync::{Arc, RwLock};
+use std::sync::Arc;
+use tokio::sync::RwLock;
 use tokio_xmpp::connect::ServerConnector;
 pub use tokio_xmpp::parsers;
 use tokio_xmpp::parsers::{disco::DiscoInfoResult, message::MessageType};
diff --git a/xmpp/src/builder.rs b/xmpp/src/builder.rs
index 73ceaab96093adc2a15bb783f1a39abf333ace0b..88889bd49ac7472aea6106a5e88e95bbc09cbd98 100644
--- a/xmpp/src/builder.rs
+++ b/xmpp/src/builder.rs
@@ -4,7 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-use std::sync::{Arc, RwLock};
+use std::sync::Arc;
+use tokio::sync::RwLock;
 use tokio_xmpp::connect::ServerConnector;
 use tokio_xmpp::{
     jid::{BareJid, Jid},
diff --git a/xmpp/src/muc/room.rs b/xmpp/src/muc/room.rs
index 96f62893b6a51a4bd39e614433dc9aadca527e98..41e8232160eecad8b34b810f26a895b7945b51c2 100644
--- a/xmpp/src/muc/room.rs
+++ b/xmpp/src/muc/room.rs
@@ -28,7 +28,12 @@ pub async fn join_room<C: ServerConnector>(
         muc = muc.with_password(password);
     }
 
-    let nick = nick.unwrap_or_else(|| agent.default_nick.read().unwrap().clone());
+    let nick = if let Some(nick) = nick {
+        nick
+    } else {
+        agent.default_nick.read().await.clone()
+    };
+
     let room_jid = room.with_resource_str(&nick).unwrap();
     let mut presence = Presence::new(PresenceType::None).with_to(room_jid);
     presence.add_payload(muc);