diff --git a/voice.py b/voice.py
index c492b24..696d54d 100644
--- a/voice.py
+++ b/voice.py
@@ -138,6 +138,13 @@ class VoiceSession:
                 kp.set_key(caller_id, key, index)
                 logger.info("Live-updated caller raw key[%d] for %s (%d bytes)",
                             index, caller_id, len(key))
+                # Also set for all current remote participants by LK identity —
+                # handles mismatch between Matrix device_id and LK session identity.
+                for p in self.lk_room.remote_participants.values():
+                    if p.identity != caller_id:
+                        kp.set_key(p.identity, key, index)
+                        logger.info("Live-updated caller raw key[%d] for LK identity %s",
+                                    index, p.identity)
             except Exception as e:
                 logger.warning("Failed to live-update caller key: %s", e)
 
@@ -250,6 +257,17 @@ class VoiceSession:
             @self.lk_room.on("participant_connected")
             def on_p(p):
                 logger.info("Participant connected: %s", p.identity)
+                # Apply any already-received caller keys to the new participant's LK identity.
+                # This handles the case where key arrives before the participant joins LiveKit.
+                if self._caller_all_keys:
+                    try:
+                        kp_local = self.lk_room.e2ee_manager.key_provider
+                        for idx, base_k in sorted(self._caller_all_keys.items()):
+                            kp_local.set_key(p.identity, base_k, idx)
+                        logger.info("on_p: applied %d caller key(s) to %s",
+                                    len(self._caller_all_keys), p.identity)
+                    except Exception as exc:
+                        logger.warning("on_p: failed to set caller key for %s: %s", p.identity, exc)
 
             @self.lk_room.on("track_published")
             def on_tp(pub, p):