diff --git a/src/matrix.rs b/src/matrix.rs
index 1b2929a..17665c0 100644
--- a/src/matrix.rs
+++ b/src/matrix.rs
@@ -468,12 +468,15 @@ pub async fn create_matrix_client(
 
     let event_handler = Arc::new(MatrixHandler { message_tx });
 
-    let on_msg_ctx = event_handler.clone();
-    client
-        .register_event_handler(move |ev, room| {
-            on_room_message_event(client.clone(), on_msg_ctx.clone(), ev, room)
-        })
-        .await;
+    {
+        let on_msg_ctx = event_handler.clone();
+        let client_2 = client.clone();
+        client
+            .register_event_handler(move |ev, room| {
+                on_room_message_event(client_2.clone(), on_msg_ctx.clone(), ev, room)
+            })
+            .await;
+    }
 
     let on_redact_ctx = event_handler.clone();
     client