diff --git a/matrix_sdk_crypto/src/machine.rs b/matrix_sdk_crypto/src/machine.rs
index 65acbbcb..383b348f 100644
--- a/matrix_sdk_crypto/src/machine.rs
+++ b/matrix_sdk_crypto/src/machine.rs
@@ -302,17 +302,13 @@ impl OlmMachine {
         for (user_id, user_devices) in &response.one_time_keys {
             for (device_id, key_map) in user_devices {
                 let device: Device = match self.store.get_device(&user_id, device_id).await {
-                    Ok(d) => {
-                        if let Some(d) = d {
-                            d
-                        } else {
-                            warn!(
-                                "Tried to create an Olm session for {} {}, but \
-                                the device is unknown",
-                                user_id, device_id
-                            );
-                            continue;
-                        }
+                    Ok(Some(d)) => d,
+                    Ok(None) => {
+                        warn!(
+                            "Tried to create an Olm session for {} {}, but the device is unknown",
+                            user_id, device_id
+                        );
+                        continue;
                     }
                     Err(e) => {
                         warn!(