diff --git a/src/pages/RepoPage/BundlesTab/BundleContent/AssetsTable/ModulesTable.tsx b/src/pages/RepoPage/BundlesTab/BundleContent/AssetsTable/ModulesTable.tsx
index 218063eb9d..5258f00bd0 100644
--- a/src/pages/RepoPage/BundlesTab/BundleContent/AssetsTable/ModulesTable.tsx
+++ b/src/pages/RepoPage/BundlesTab/BundleContent/AssetsTable/ModulesTable.tsx
@@ -78,7 +78,6 @@ const ModulesTable: React.FC<ModulesTableProps> = ({ asset }) => {
     branch,
     bundle,
     asset,
-    opts: { enabled: bundle !== '' },
   })
 
   const tableData = useMemo(() => {
diff --git a/src/pages/RepoPage/BundlesTab/BundleContent/BundleChart/useBundleChartData.ts b/src/pages/RepoPage/BundlesTab/BundleContent/BundleChart/useBundleChartData.ts
index 1de3a62de0..425ba1ce98 100644
--- a/src/pages/RepoPage/BundlesTab/BundleContent/BundleChart/useBundleChartData.ts
+++ b/src/pages/RepoPage/BundlesTab/BundleContent/BundleChart/useBundleChartData.ts
@@ -68,8 +68,8 @@ export function useBundleChartData({
           'UNKNOWN_SIZE',
         ]
 
-  const { data: trendData, isLoading } = useQueryV5(
-    BundleTrendDataQueryOpts({
+  const { data: trendData, isLoading } = useQueryV5({
+    ...BundleTrendDataQueryOpts({
       provider,
       owner,
       repo,
@@ -84,9 +84,9 @@ export function useBundleChartData({
         // temp removing while we don't have filtering by types implemented
         // loadTypes: loadTypes,
       },
-      enabled: !!overview?.oldestCommitAt,
-    })
-  )
+    }),
+    enabled: !!overview?.oldestCommitAt,
+  })
 
   const mergedData = useMemo(() => {
     const mergedDataMap = new Map<string, { [key: string]: number }>()
diff --git a/src/pages/RepoPage/BundlesTab/BundleContent/BundleDetails/BundleDetails.tsx b/src/pages/RepoPage/BundlesTab/BundleContent/BundleDetails/BundleDetails.tsx
index 55d8ca6870..f62a82042d 100644
--- a/src/pages/RepoPage/BundlesTab/BundleContent/BundleDetails/BundleDetails.tsx
+++ b/src/pages/RepoPage/BundlesTab/BundleContent/BundleDetails/BundleDetails.tsx
@@ -85,7 +85,6 @@ export const BundleDetails: React.FC = () => {
       reportGroups: types,
       loadTypes: loadTypes,
     },
-    opts: { enabled: bundle !== '' },
   })
 
   if (!bundle || !summaryData || !summaryData.bundleSummary) {
diff --git a/src/services/bundleAnalysis/BranchBundlesNamesQueryOpts.tsx b/src/services/bundleAnalysis/BranchBundlesNamesQueryOpts.tsx
index a006e10115..2f13591f64 100644
--- a/src/services/bundleAnalysis/BranchBundlesNamesQueryOpts.tsx
+++ b/src/services/bundleAnalysis/BranchBundlesNamesQueryOpts.tsx
@@ -91,6 +91,7 @@ const query = `query BranchBundlesNames(
     }
   }
 }`
+
 interface BranchBundlesNamesQueryOptsArgs {
   provider: string
   owner: string
diff --git a/src/services/bundleAnalysis/BundleTrendDataQueryOpts.tsx b/src/services/bundleAnalysis/BundleTrendDataQueryOpts.tsx
index 5bade00239..9566a8724f 100644
--- a/src/services/bundleAnalysis/BundleTrendDataQueryOpts.tsx
+++ b/src/services/bundleAnalysis/BundleTrendDataQueryOpts.tsx
@@ -148,8 +148,6 @@ interface BundleTrendDataQueryOptsArgs {
     // temp removing while we don't have filtering by types implemented
     // loadTypes: Array<(typeof BUNDLE_LOAD_TYPE_ITEMS)[number]>
   }
-  enabled?: boolean
-  suspense?: boolean
 }
 
 export const BundleTrendDataQueryOpts = ({
@@ -162,10 +160,8 @@ export const BundleTrendDataQueryOpts = ({
   before,
   after,
   filters,
-  enabled,
 }: BundleTrendDataQueryOptsArgs) =>
   queryOptionsV5({
-    enabled: enabled,
     queryKey: [
       'GetBundleTrend',
       provider,
diff --git a/src/services/bundleAnalysis/useBranchBundleSummary.tsx b/src/services/bundleAnalysis/useBranchBundleSummary.tsx
index f3d477f1cf..39120b4fef 100644
--- a/src/services/bundleAnalysis/useBranchBundleSummary.tsx
+++ b/src/services/bundleAnalysis/useBranchBundleSummary.tsx
@@ -135,7 +135,6 @@ export interface BranchBundleSummaryQueryOptsArgs {
   owner: string
   repo: string
   branch: string | null | undefined
-  repoOverviewIsSuccess: boolean
 }
 
 export const BranchBundleSummaryQueryOpts = ({
@@ -143,7 +142,6 @@ export const BranchBundleSummaryQueryOpts = ({
   owner,
   repo,
   branch,
-  repoOverviewIsSuccess,
 }: BranchBundleSummaryQueryOptsArgs) =>
   queryOptionsV5({
     queryKey: ['BranchBundleSummaryData', provider, owner, repo, branch],
@@ -200,7 +198,6 @@ export const BranchBundleSummaryQueryOpts = ({
 
         return { branch }
       }),
-    enabled: repoOverviewIsSuccess && typeof branch === 'string',
   })
 
 export interface UseBranchBundleSummaryArgs {
@@ -216,7 +213,7 @@ export const useBranchBundleSummary = ({
   repo,
   branch: branchArg,
 }: UseBranchBundleSummaryArgs) => {
-  const { data: repoOverview, isSuccess } = useRepoOverview({
+  const { data: repoOverview } = useRepoOverview({
     provider,
     repo,
     owner,
@@ -230,7 +227,6 @@ export const useBranchBundleSummary = ({
       owner,
       repo,
       branch,
-      repoOverviewIsSuccess: isSuccess,
     })
   )
 }
diff --git a/src/services/bundleAnalysis/useBundleAssetModules.tsx b/src/services/bundleAnalysis/useBundleAssetModules.tsx
index 207e29f50b..6cbcf3258f 100644
--- a/src/services/bundleAnalysis/useBundleAssetModules.tsx
+++ b/src/services/bundleAnalysis/useBundleAssetModules.tsx
@@ -141,9 +141,6 @@ interface BundleAssetModulesQueryOptsArgs {
   branch: string
   bundle: string
   asset: string
-  opts?: {
-    enabled?: boolean
-  }
 }
 
 export const BundleAssetModulesQueryOpts = ({
@@ -153,13 +150,7 @@ export const BundleAssetModulesQueryOpts = ({
   branch,
   bundle,
   asset,
-  opts = {},
 }: BundleAssetModulesQueryOptsArgs) => {
-  let enabled = true
-  if (opts.enabled) {
-    enabled = opts.enabled
-  }
-
   return queryOptionsV5({
     queryKey: [
       'BundleAssetModules',
@@ -235,7 +226,6 @@ export const BundleAssetModulesQueryOpts = ({
 
         return { modules }
       }),
-    enabled: enabled,
   })
 }
 
@@ -246,9 +236,6 @@ interface UseBundleAssetModulesArgs {
   branch: string
   bundle: string
   asset: string
-  opts?: {
-    enabled?: boolean
-  }
 }
 
 export const useBundleAssetModules = ({
@@ -258,7 +245,6 @@ export const useBundleAssetModules = ({
   branch,
   bundle,
   asset,
-  opts = {},
 }: UseBundleAssetModulesArgs) => {
   return useSuspenseQueryV5(
     BundleAssetModulesQueryOpts({
@@ -268,7 +254,6 @@ export const useBundleAssetModules = ({
       branch,
       bundle,
       asset,
-      opts,
     })
   )
 }
diff --git a/src/services/bundleAnalysis/useBundleAssets.tsx b/src/services/bundleAnalysis/useBundleAssets.tsx
index c74ec8cae0..5dd451307c 100644
--- a/src/services/bundleAnalysis/useBundleAssets.tsx
+++ b/src/services/bundleAnalysis/useBundleAssets.tsx
@@ -220,10 +220,6 @@ interface BundleAssetQueryOptsArgs {
   }
   orderingDirection?: OrderingDirection
   ordering?: 'NAME' | 'SIZE' | 'TYPE'
-  opts?: {
-    enabled?: boolean
-    suspense?: boolean
-  }
 }
 
 export const BundleAssetsQueryOpts = ({
@@ -238,9 +234,6 @@ export const BundleAssetsQueryOpts = ({
   filters = {},
   orderingDirection,
   ordering,
-  opts = {
-    enabled: true,
-  },
 }: BundleAssetQueryOptsArgs) =>
   infiniteQueryOptionsV5({
     queryKey: [
@@ -353,7 +346,6 @@ export const BundleAssetsQueryOpts = ({
     getNextPageParam: (data) => {
       return data?.pageInfo?.hasNextPage ? data?.pageInfo?.endCursor : null
     },
-    enabled: opts?.enabled !== undefined ? opts.enabled : true,
   })
 
 interface UseBundleAssetsArgs {
@@ -373,7 +365,6 @@ interface UseBundleAssetsArgs {
   ordering?: 'NAME' | 'SIZE' | 'TYPE'
   opts?: {
     enabled?: boolean
-    suspense?: boolean
   }
 }
 
@@ -391,8 +382,8 @@ export const useBundleAssets = ({
   ordering,
   opts,
 }: UseBundleAssetsArgs) => {
-  return useInfiniteQueryV5(
-    BundleAssetsQueryOpts({
+  return useInfiniteQueryV5({
+    ...BundleAssetsQueryOpts({
       provider,
       owner,
       repo,
@@ -404,7 +395,7 @@ export const useBundleAssets = ({
       filters,
       orderingDirection,
       ordering,
-      opts,
-    })
-  )
+    }),
+    enabled: opts?.enabled,
+  })
 }
diff --git a/src/services/bundleAnalysis/useBundleSummary.tsx b/src/services/bundleAnalysis/useBundleSummary.tsx
index 75be5c23e8..925d330361 100644
--- a/src/services/bundleAnalysis/useBundleSummary.tsx
+++ b/src/services/bundleAnalysis/useBundleSummary.tsx
@@ -133,9 +133,6 @@ interface BundleSummaryQueryOptsArgs {
     reportGroups?: string[]
     loadTypes?: string[]
   }
-  opts?: {
-    enabled?: boolean
-  }
 }
 
 export const BundleSummaryQueryOpts = ({
@@ -145,7 +142,6 @@ export const BundleSummaryQueryOpts = ({
   branch,
   bundle,
   filters,
-  opts = {},
 }: BundleSummaryQueryOptsArgs) =>
   queryOptionsV5({
     queryKey: ['BundleSummary', provider, owner, repo, branch, bundle, filters],
@@ -206,7 +202,6 @@ export const BundleSummaryQueryOpts = ({
 
         return { bundleSummary }
       }),
-    enabled: opts?.enabled,
   })
 
 interface UseBundleSummaryArgs {
@@ -219,9 +214,6 @@ interface UseBundleSummaryArgs {
     reportGroups?: string[]
     loadTypes?: string[]
   }
-  opts?: {
-    enabled?: boolean
-  }
 }
 
 export const useBundleSummary = ({
@@ -231,7 +223,6 @@ export const useBundleSummary = ({
   branch: branchParam,
   bundle,
   filters = {},
-  opts = {},
 }: UseBundleSummaryArgs) => {
   const { data: overview } = useRepoOverview({
     provider,
@@ -252,7 +243,6 @@ export const useBundleSummary = ({
       branch,
       bundle,
       filters,
-      opts,
     })
   )
 }