diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx
index 034be16d..e87072d3 100644
--- a/src/room/InCallView.tsx
+++ b/src/room/InCallView.tsx
@@ -158,7 +158,8 @@ export const ActiveCall: FC<ActiveCallProps> = (props) => {
     };
   }, [livekitRoom]);
 
-  const { autoLeaveWhenOthersLeft } = useUrlParams();
+  const { autoLeaveWhenOthersLeft, sendNotificationType, waitForCallPickup } =
+    useUrlParams();
 
   useEffect(() => {
     if (livekitRoom !== undefined) {
@@ -171,6 +172,8 @@ export const ActiveCall: FC<ActiveCallProps> = (props) => {
         {
           encryptionSystem: props.e2eeSystem,
           autoLeaveWhenOthersLeft,
+          waitForCallPickup:
+            waitForCallPickup && sendNotificationType === "ring",
         },
         connStateObservable$,
         reactionsReader.raisedHands$,
@@ -190,6 +193,8 @@ export const ActiveCall: FC<ActiveCallProps> = (props) => {
     props.e2eeSystem,
     connStateObservable$,
     autoLeaveWhenOthersLeft,
+    sendNotificationType,
+    waitForCallPickup,
   ]);
 
   if (livekitRoom === undefined || vm === null) return null;
diff --git a/src/state/CallViewModel.ts b/src/state/CallViewModel.ts
index 5b946f09..5dbb0b9c 100644
--- a/src/state/CallViewModel.ts
+++ b/src/state/CallViewModel.ts
@@ -907,15 +907,17 @@ export class CallViewModel extends ViewModel {
       >
     >
   ).pipe(
+    filter(
+      ([notificationEvent]) => notificationEvent.notification_type === "ring",
+    ),
     map(([notificationEvent]) => {
-      // event.lifetime is expected to be in ms
-      const lifetime = notificationEvent?.lifetime ?? 0;
+      const lifetimeMs = notificationEvent?.lifetime ?? 0;
       return concat(
-        lifetime === 0
+        lifetimeMs === 0
           ? // If no lifetime, skip the ring state
             EMPTY
           : // Ring until lifetime ms have passed
-            timer(lifetime).pipe(
+            timer(lifetimeMs).pipe(
               ignoreElements(),
               startWith("ringing" as const),
             ),