diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs
index b243ae66..dda97428 100644
--- a/matrix_sdk_base/src/client.rs
+++ b/matrix_sdk_base/src/client.rs
@@ -1879,7 +1879,7 @@ impl BaseClient {
             .lock()
             .await
             .as_ref()
-            .and_then(|o| Some(o.start_verification(device)))
+            .map(|o| o.start_verification(device))
     }
 }