diff --git a/src/pages/OwnerPage/HeaderBanners/HeaderBanners.jsx b/src/pages/OwnerPage/HeaderBanners/HeaderBanners.jsx
index 136da130e1..968a983290 100644
--- a/src/pages/OwnerPage/HeaderBanners/HeaderBanners.jsx
+++ b/src/pages/OwnerPage/HeaderBanners/HeaderBanners.jsx
@@ -45,7 +45,6 @@ const AlertBanners = ({ isUploadLimitExceeded, isApproachingUploadLimit }) => {
 AlertBanners.propTypes = {
   isUploadLimitExceeded: PropTypes.bool.isRequired,
   isApproachingUploadLimit: PropTypes.bool.isRequired,
-  hasGhApp: PropTypes.bool.isRequired,
 }
 
 export default function HeaderBanners() {
diff --git a/src/pages/OwnerPage/OwnerPage.jsx b/src/pages/OwnerPage/OwnerPage.jsx
index 06af7655ba..fd06b30a4a 100644
--- a/src/pages/OwnerPage/OwnerPage.jsx
+++ b/src/pages/OwnerPage/OwnerPage.jsx
@@ -70,6 +70,9 @@ function OwnerPage() {
   const { data: accountDetails } = useAccountDetails({
     provider,
     owner,
+    opts: {
+      enabled: !!ownerData?.isCurrentUserPartOfOrg,
+    },
   })
 
   const hasGhApp = !!accountDetails?.integrationId
diff --git a/src/services/account/usePlanData.test.tsx b/src/services/account/usePlanData.test.tsx
index 17f00434ef..1639d22901 100644
--- a/src/services/account/usePlanData.test.tsx
+++ b/src/services/account/usePlanData.test.tsx
@@ -131,7 +131,7 @@ describe('usePlanData', () => {
         vi.restoreAllMocks()
       })
 
-      it('returns an empty object', async () => {
+      it.only('returns an empty object', async () => {
         setup({ trialData: undefined })
         const { result } = renderHook(
           () =>
@@ -141,13 +141,10 @@ describe('usePlanData', () => {
             }),
           { wrapper }
         )
-
-        await waitFor(() => expect(result.current.isError).toBeTruthy())
-        await waitFor(() =>
-          expect(result.current.error).toEqual(
-            expect.objectContaining({ status: 404 })
-          )
-        )
+        await waitFor(() => {
+          console.log('data: ', result.current.data)
+          expect(result.current.data).toStrictEqual({})
+        })
       })
     })
   })
diff --git a/src/services/account/usePlanData.ts b/src/services/account/usePlanData.ts
index 3b1c2a85b4..b6fe5771be 100644
--- a/src/services/account/usePlanData.ts
+++ b/src/services/account/usePlanData.ts
@@ -52,7 +52,7 @@ export const PlanDataSchema = z
   .object({
     owner: z
       .object({
-        hasPrivateRepos: z.boolean(),
+        hasPrivateRepos: z.boolean().nullish(),
         plan: PlanSchema.nullish(),
         pretrialPlan: PretrialPlanSchema.nullish(),
       })
@@ -118,7 +118,6 @@ export const usePlanData = ({ provider, owner, opts }: UsePlanDataArgs) =>
         },
       }).then((res) => {
         const parsedRes = PlanDataSchema.safeParse(res?.data)
-
         if (!parsedRes.success) {
           return Promise.reject({
             status: 404,