diff --git a/src/e2ee.rs b/src/e2ee.rs
index 0a357231a..f5b385861 100644
--- a/src/e2ee.rs
+++ b/src/e2ee.rs
@@ -166,11 +166,10 @@ pub async fn try_decrypt(
     }
     if let Some(peerstate) = peerstate {
         peerstate.handle_fingerprint_change(context).await?;
-        if let Some(key) = peerstate.gossip_key {
-            public_keyring_for_validate.add(key);
-        }
         if let Some(key) = peerstate.public_key {
             public_keyring_for_validate.add(key);
+        } else if let Some(key) = peerstate.gossip_key {
+            public_keyring_for_validate.add(key);
         }
     }