diff --git a/src/e2ee.rs b/src/e2ee.rs
index fec676c14..cc13abcf2 100644
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -198,15 +198,15 @@ fn load_or_generate_self_public_key(
     self_addr: impl AsRef<str>,
 ) -> Result<SignedPublicKey> {
     if let Some(key) = Key::from_self_public(context, &self_addr, &context.sql) {
-        return Ok(SignedPublicKey::try_from(key)
-            .map_err(|_| Error::Message("Not a public key".into()))?);
+        return SignedPublicKey::try_from(key)
+            .map_err(|_| Error::Message("Not a public key".into()));
     }
     let _guard = context.generating_key_mutex.lock().unwrap();
 
     // Check again in case the key was generated while we were waiting for the lock.
     if let Some(key) = Key::from_self_public(context, &self_addr, &context.sql) {
-        return Ok(SignedPublicKey::try_from(key)
-            .map_err(|_| Error::Message("Not a public key".into()))?);
+        return SignedPublicKey::try_from(key)
+            .map_err(|_| Error::Message("Not a public key".into()));
     }
 
     let start = std::time::Instant::now();