diff --git a/packages/platform/atoms/booker-embed/BookerEmbed.tsx b/packages/platform/atoms/booker-embed/BookerEmbed.tsx
index 722cf7837840ed..e0abf3baab037b 100644
--- a/packages/platform/atoms/booker-embed/BookerEmbed.tsx
+++ b/packages/platform/atoms/booker-embed/BookerEmbed.tsx
@@ -29,7 +29,7 @@ export const BookerEmbed = (
         preventEventTypeRedirect?: BookerPlatformWrapperAtomPropsForTeam["preventEventTypeRedirect"];
       }
     | (BookerPlatformWrapperAtomPropsForIndividual & {
-        organizationId?: undefined;
+        organizationId?: number;
         routingFormUrl?: undefined;
       })
     | (BookerPlatformWrapperAtomPropsForTeam & { organizationId?: number; routingFormUrl?: undefined })
diff --git a/packages/platform/atoms/cal-provider/BaseCalProvider.tsx b/packages/platform/atoms/cal-provider/BaseCalProvider.tsx
index e230a4ba29b85a..440901e7547a79 100644
--- a/packages/platform/atoms/cal-provider/BaseCalProvider.tsx
+++ b/packages/platform/atoms/cal-provider/BaseCalProvider.tsx
@@ -60,7 +60,7 @@ export function BaseCalProvider({
   const [error, setError] = useState<string>("");
   const [stateOrgId, setOrganizationId] = useState<number>(0);
 
-  const { data: me } = useMe();
+  const { data: me } = useMe(isEmbed);
 
   const { mutateAsync } = useUpdateUserTimezone();
 
diff --git a/packages/platform/atoms/hooks/event-types/public/useAtomGetPublicEvent.tsx b/packages/platform/atoms/hooks/event-types/public/useAtomGetPublicEvent.tsx
index 312581178b5873..ae0a642822da96 100644
--- a/packages/platform/atoms/hooks/event-types/public/useAtomGetPublicEvent.tsx
+++ b/packages/platform/atoms/hooks/event-types/public/useAtomGetPublicEvent.tsx
@@ -33,13 +33,19 @@ export const useAtomGetPublicEvent = ({ username, eventSlug, isTeamEvent, teamId
   const event = useQuery({
     queryKey: [QUERY_KEY, username, eventSlug, isTeamEvent, teamId, organizationId],
     queryFn: () => {
+      const params: Record<string, any> = {
+        isTeamEvent,
+        teamId,
+        username: getUsernameList(username ?? "").join(",")
+      };
+      
+      // Only include orgId if it's not 0
+      if (organizationId !== 0) {
+        params.orgId = organizationId;
+      }
+      
       return http?.get<ApiResponse<PublicEventType>>(pathname, {
-        params: {
-          isTeamEvent,
-          teamId,
-          orgId: organizationId,
-          username: getUsernameList(username?? "").join(",")
-        },
+        params,
       })
         .then((res) => {
           if (res.data.status === SUCCESS_STATUS) {
diff --git a/packages/platform/atoms/hooks/useMe.ts b/packages/platform/atoms/hooks/useMe.ts
index aa861706aafcc3..18d569412000e0 100644
--- a/packages/platform/atoms/hooks/useMe.ts
+++ b/packages/platform/atoms/hooks/useMe.ts
@@ -11,7 +11,7 @@ export const QUERY_KEY = "get-me";
  * Access Token must be provided to CalProvider in order to use this hook
  * @returns The result of the query containing the user's profile.
  */
-export const useMe = () => {
+export const useMe = (isEmbed: boolean = false) => {
   const pathname = `/${V2_ENDPOINTS.me}`;
   const me = useQuery({
     queryKey: [QUERY_KEY],
@@ -23,7 +23,7 @@ export const useMe = () => {
         throw new Error(res.data.error.message);
       });
     },
-    enabled: Boolean(http.getAuthorizationHeader()),
+    enabled: Boolean(http.getAuthorizationHeader()) && !isEmbed,
   });
 
   return me;
diff --git a/packages/platform/atoms/hooks/useOAuthClient.ts b/packages/platform/atoms/hooks/useOAuthClient.ts
index 9a181189350f7e..9d0983ffbe2874 100644
--- a/packages/platform/atoms/hooks/useOAuthClient.ts
+++ b/packages/platform/atoms/hooks/useOAuthClient.ts
@@ -55,7 +55,7 @@ export const useOAuthClient = ({
         console.error(err);
       }
     }
-  }, [isEmbed, clientId, onError, prevClientId, onSuccess]);
+  }, [isEmbed, clientId, onError, prevClientId, onSuccess, http.getUrl()]);
 
   return { isInit };
 };