diff --git a/src/room/GroupCallView.tsx b/src/room/GroupCallView.tsx
index 89ddb910..248ce2dc 100644
--- a/src/room/GroupCallView.tsx
+++ b/src/room/GroupCallView.tsx
@@ -436,7 +436,7 @@ export const GroupCallView: FC<Props> = ({
         client={client}
         matrixInfo={matrixInfo}
         muteStates={muteStates}
-        onEnter={() => enterRTCSessionOrError(rtcSession)}
+        onEnter={async () => enterRTCSessionOrError(rtcSession)}
         confineToRoom={confineToRoom}
         hideHeader={header === HeaderStyle.None}
         participantCount={participantCount}
diff --git a/src/room/LobbyView.tsx b/src/room/LobbyView.tsx
index 70925a9c..47ecae50 100644
--- a/src/room/LobbyView.tsx
+++ b/src/room/LobbyView.tsx
@@ -193,13 +193,9 @@ export const LobbyView: FC<Props> = ({
 
   useTrackProcessorSync(videoTrack);
 
-  const onEnterCall = useCallback(async () => {
-    try {
-      setWaiting(true);
-      await onEnter();
-    } finally {
-      setWaiting(false);
-    }
+  const onEnterCall = useCallback(() => {
+    setWaiting(true);
+    void onEnter().finally(() => setWaiting(false));
   }, [onEnter]);
 
   const [waiting, setWaiting] = useState(waitingForInvite);