diff --git a/src/rtcSessionHelpers.ts b/src/rtcSessionHelpers.ts index 27a0aeb2..c6522394 100644 --- a/src/rtcSessionHelpers.ts +++ b/src/rtcSessionHelpers.ts @@ -123,12 +123,8 @@ export async function enterRTCSession( useMultiSfu: true, }, ): Promise { - const { - encryptMedia, - useExperimentalToDeviceTransport = false, - useMultiSfu = true, - } = options; - + const { encryptMedia, useExperimentalToDeviceTransport = false } = options; + const useMultiSfu = preferStickyEvents.getValue() ?? options.useMultiSfu; PosthogAnalytics.instance.eventCallEnded.cacheStartCall(new Date()); PosthogAnalytics.instance.eventCallStarted.track(rtcSession.room.roomId); diff --git a/src/settings/DeveloperSettingsTab.tsx b/src/settings/DeveloperSettingsTab.tsx index 681e2f3e..63c5dabc 100644 --- a/src/settings/DeveloperSettingsTab.tsx +++ b/src/settings/DeveloperSettingsTab.tsx @@ -199,7 +199,9 @@ export const DeveloperSettingsTab: FC = ({ client, livekitRooms }) => { id="multiSfu" type="checkbox" label={t("developer_mode.multi_sfu")} - checked={multiSfu} + // If using sticky events we implicitly prefer use multi-sfu + checked={multiSfu || preferStickyEvents} + disabled={preferStickyEvents} onChange={useCallback( (event: ChangeEvent): void => { setMultiSfu(event.target.checked);