diff --git a/packages/features/bookings/Booker/components/LargeCalendar.tsx b/packages/features/bookings/Booker/components/LargeCalendar.tsx
index 64e3a025da..8d71521eb4 100644
--- a/packages/features/bookings/Booker/components/LargeCalendar.tsx
+++ b/packages/features/bookings/Booker/components/LargeCalendar.tsx
@@ -30,7 +30,7 @@ export const LargeCalendar = ({
   const selectedEventDuration = useBookerStore((state) => state.selectedDuration);
   const overlayEvents = useOverlayCalendarStore((state) => state.overlayBusyDates);
   const displayOverlay =
-    getQueryParam("overlayCalendar") === "true" || localStorage.getItem("overlayCalendarSwitchDefault");
+    getQueryParam("overlayCalendar") === "true" || localStorage?.getItem("overlayCalendarSwitchDefault");
 
   const eventDuration = selectedEventDuration || event?.data?.length || 30;
 
diff --git a/packages/features/bookings/Booker/types.ts b/packages/features/bookings/Booker/types.ts
index 9dfa3d34b4..1c9ce2f145 100644
--- a/packages/features/bookings/Booker/types.ts
+++ b/packages/features/bookings/Booker/types.ts
@@ -153,5 +153,5 @@ export type CustomClassNames = {
     availableTimeSlotsTimeFormatToggle?: string;
     availableTimes?: string;
   };
-  atomsWrapper: string;
+  atomsWrapper?: string;
 };
diff --git a/packages/features/bookings/components/AvailableTimes.tsx b/packages/features/bookings/components/AvailableTimes.tsx
index 309873cc7d..1e0eca7507 100644
--- a/packages/features/bookings/components/AvailableTimes.tsx
+++ b/packages/features/bookings/components/AvailableTimes.tsx
@@ -64,7 +64,7 @@ const SlotItem = ({
   const { t } = useLocale();
 
   const overlayCalendarToggled =
-    getQueryParam("overlayCalendar") === "true" || localStorage.getItem("overlayCalendarSwitchDefault");
+    getQueryParam("overlayCalendar") === "true" || localStorage?.getItem("overlayCalendarSwitchDefault");
   const [timeFormat, timezone] = useTimePreferences((state) => [state.timeFormat, state.timezone]);
   const bookingData = useBookerStore((state) => state.bookingData);
   const layout = useBookerStore((state) => state.layout);
diff --git a/packages/platform/atoms/booker-embed/BookerEmbed.tsx b/packages/platform/atoms/booker-embed/BookerEmbed.tsx
index b498da612f..2dffe6052e 100644
--- a/packages/platform/atoms/booker-embed/BookerEmbed.tsx
+++ b/packages/platform/atoms/booker-embed/BookerEmbed.tsx
@@ -11,6 +11,7 @@ export const BookerEmbed = (
   return (
     <CalProvider
       clientId={import.meta.env.VITE_BOOKER_EMBED_OAUTH_CLIENT_ID}
+      isEmbed={true}
       options={{
         apiUrl: import.meta.env.VITE_BOOKER_EMBED_API_URL,
       }}>
diff --git a/packages/platform/atoms/booker/BookerPlatformWrapper.tsx b/packages/platform/atoms/booker/BookerPlatformWrapper.tsx
index c779f0bb93..11156240e9 100644
--- a/packages/platform/atoms/booker/BookerPlatformWrapper.tsx
+++ b/packages/platform/atoms/booker/BookerPlatformWrapper.tsx
@@ -361,9 +361,9 @@ export const BookerPlatformWrapper = (
     (state: boolean) => {
       setIsOverlayCalendarEnabled(state);
       if (state) {
-        localStorage.setItem("overlayCalendarSwitchDefault", "true");
+        localStorage?.setItem("overlayCalendarSwitchDefault", "true");
       } else {
-        localStorage.removeItem("overlayCalendarSwitchDefault");
+        localStorage?.removeItem("overlayCalendarSwitchDefault");
       }
     },
     [setIsOverlayCalendarEnabled]
@@ -394,7 +394,7 @@ export const BookerPlatformWrapper = (
 
   useEffect(() => {
     if (isOverlayCalendarEnabled && view === "MONTH_VIEW") {
-      localStorage.removeItem("overlayCalendarSwitchDefault");
+      localStorage?.removeItem("overlayCalendarSwitchDefault");
     }
     setIsOverlayCalendarEnabled(Boolean(localStorage?.getItem?.("overlayCalendarSwitchDefault")));
   }, [view, isOverlayCalendarEnabled]);
diff --git a/packages/platform/atoms/cal-provider/BaseCalProvider.tsx b/packages/platform/atoms/cal-provider/BaseCalProvider.tsx
index dd5f388770..f346f28c6b 100644
--- a/packages/platform/atoms/cal-provider/BaseCalProvider.tsx
+++ b/packages/platform/atoms/cal-provider/BaseCalProvider.tsx
@@ -39,6 +39,7 @@ export function BaseCalProvider({
   language = EN,
   organizationId,
   onTimezoneChange,
+  isEmbed,
 }: CalProviderProps) {
   const [error, setError] = useState<string>("");
   const [stateOrgId, setOrganizationId] = useState<number>(0);
@@ -63,6 +64,7 @@ export function BaseCalProvider({
   useTimezone(getTimezoneChangeHandler());
 
   const { isInit } = useOAuthClient({
+    isEmbed,
     clientId,
     apiUrl: options.apiUrl,
     refreshUrl: options.refreshUrl,
diff --git a/packages/platform/atoms/cal-provider/CalProvider.tsx b/packages/platform/atoms/cal-provider/CalProvider.tsx
index 76df7cdc1f..68c1e65f76 100644
--- a/packages/platform/atoms/cal-provider/CalProvider.tsx
+++ b/packages/platform/atoms/cal-provider/CalProvider.tsx
@@ -72,6 +72,7 @@ export type CalProviderProps = {
   onTimezoneChange?: () => void;
   version?: API_VERSIONS_ENUM;
   organizationId?: number;
+  isEmbed?: boolean;
 } & i18nProps;
 
 /**
@@ -99,6 +100,7 @@ export function CalProvider({
   onTimezoneChange,
   version = VERSION_2024_06_14,
   organizationId,
+  isEmbed = false,
 }: CalProviderProps) {
   useEffect(() => {
     http.setVersionHeader(version);
@@ -113,6 +115,7 @@ export function CalProvider({
   return (
     <QueryClientProvider client={queryClient}>
       <BaseCalProvider
+        isEmbed={isEmbed}
         autoUpdateTimezone={autoUpdateTimezone}
         onTimezoneChange={onTimezoneChange}
         clientId={clientId}
diff --git a/packages/platform/atoms/hooks/useOAuthClient.ts b/packages/platform/atoms/hooks/useOAuthClient.ts
index 70fa9c5787..a55c93b2a7 100644
--- a/packages/platform/atoms/hooks/useOAuthClient.ts
+++ b/packages/platform/atoms/hooks/useOAuthClient.ts
@@ -8,13 +8,21 @@ import type { ApiResponse } from "@calcom/platform-types";
 import http from "../lib/http";
 
 export interface useOAuthClientProps {
+  isEmbed?: boolean;
   clientId: string;
   apiUrl?: string;
   refreshUrl?: string;
   onError: (error: string) => void;
   onSuccess: (data: { client: string; organizationId: number; name: string }) => void;
 }
-export const useOAuthClient = ({ clientId, apiUrl, refreshUrl, onError, onSuccess }: useOAuthClientProps) => {
+export const useOAuthClient = ({
+  isEmbed,
+  clientId,
+  apiUrl,
+  refreshUrl,
+  onError,
+  onSuccess,
+}: useOAuthClientProps) => {
   const prevClientId = usePrevious(clientId);
   const [isInit, setIsInit] = useState<boolean>(false);
   useEffect(() => {
@@ -28,7 +36,7 @@ export const useOAuthClient = ({ clientId, apiUrl, refreshUrl, onError, onSucces
   }, [apiUrl, refreshUrl]);
 
   useEffect(() => {
-    if (clientId && http.getUrl() && prevClientId !== clientId) {
+    if (!isEmbed && clientId && http.getUrl() && prevClientId !== clientId) {
       try {
         http
           .get<ApiResponse<{ client: string; organizationId: number; name: string }>>(`/provider/${clientId}`)
@@ -47,7 +55,7 @@ export const useOAuthClient = ({ clientId, apiUrl, refreshUrl, onError, onSucces
         console.error(err);
       }
     }
-  }, [clientId, onError, prevClientId, onSuccess]);
+  }, [isEmbed, clientId, onError, prevClientId, onSuccess]);
 
   return { isInit };
 };