diff --git a/livekit-rtc/livekit/rtc/room.py b/livekit-rtc/livekit/rtc/room.py
index 89436589..2b9792c4 100644
--- a/livekit-rtc/livekit/rtc/room.py
+++ b/livekit-rtc/livekit/rtc/room.py
@@ -202,7 +202,16 @@ async def sid(self) -> str:
         if self._info.sid:
             return self._info.sid
 
-        return await self._first_sid_future
+        # This future is shared state for the Room. Caller-side timeouts, e.g.
+        # asyncio.wait_for(room.sid, ...), should not cancel it for future waiters.
+        return await asyncio.shield(self._first_sid_future)
+
+    def _resolve_first_sid(self, sid: str) -> None:
+        # The room SID can arrive through the initial connect result or later
+        # room update events. Resolve the first-SID waiter from any source that
+        # carries it so waiters do not depend on event ordering.
+        if sid and not self._first_sid_future.done():
+            self._first_sid_future.set_result(sid)
 
     @property
     def local_participant(self) -> LocalParticipant:
@@ -545,6 +554,7 @@ def on_participant_connected(participant):
         )
 
         self._info = cb.connect.result.room.info
+        self._resolve_first_sid(self._info.sid)
         self._connection_state = ConnectionState.CONN_CONNECTED
 
         self._local_participant = LocalParticipant(
@@ -859,8 +869,7 @@ def _on_room_event(self, event: proto_room.RoomEvent) -> None:
             self._info.metadata = event.room_metadata_changed.metadata
             self.emit("room_metadata_changed", old_metadata, self.metadata)
         elif which == "room_sid_changed":
-            if not self._info.sid:
-                self._first_sid_future.set_result(event.room_sid_changed.sid)
+            self._resolve_first_sid(event.room_sid_changed.sid)
             self._info.sid = event.room_sid_changed.sid
             # This is an internal event, not exposed to users
         elif which == "participant_metadata_changed":
@@ -1019,10 +1028,12 @@ def _on_room_event(self, event: proto_room.RoomEvent) -> None:
 
         elif which == "room_updated":
             self._info = event.room_updated
+            self._resolve_first_sid(self._info.sid)
             self.emit("room_updated")
 
         elif which == "moved":
             self._info = event.moved
+            self._resolve_first_sid(self._info.sid)
             self.emit("moved")
 
         elif which == "participants_updated":