diff --git a/src/components/common/NetworkSelector/index.tsx b/src/components/common/NetworkSelector/index.tsx
index a37d54feab..82767e044a 100644
--- a/src/components/common/NetworkSelector/index.tsx
+++ b/src/components/common/NetworkSelector/index.tsx
@@ -39,7 +39,7 @@ import { type ChainInfo } from '@safe-global/safe-gateway-typescript-sdk'
 import PlusIcon from '@/public/images/common/plus.svg'
 import useAddressBook from '@/hooks/useAddressBook'
 import { CreateSafeOnSpecificChain } from '@/features/multichain/components/CreateSafeOnNewChain'
-import { useGetSafeOverviewQuery } from '@/store/safeOverviews'
+import { useGetSafeOverviewQuery } from '@/store/api/gateway'
 
 const ChainIndicatorWithFiatBalance = ({
   isSelected,
diff --git a/src/components/common/SafeTokenWidget/__tests__/SafeTokenWidget.test.tsx b/src/components/common/SafeTokenWidget/__tests__/SafeTokenWidget.test.tsx
index b92a675f2e..4f7ac6bfdc 100644
--- a/src/components/common/SafeTokenWidget/__tests__/SafeTokenWidget.test.tsx
+++ b/src/components/common/SafeTokenWidget/__tests__/SafeTokenWidget.test.tsx
@@ -5,8 +5,8 @@ import SafeTokenWidget from '..'
 import { toBeHex } from 'ethers'
 import { AppRoutes } from '@/config/routes'
 import useSafeTokenAllocation, { useSafeVotingPower } from '@/hooks/useSafeTokenAllocation'
-import * as safePass from '@/store/safePass'
-import type { CampaignLeaderboardEntry } from '@/store/safePass'
+import * as safePass from '@/store/api/safePass'
+import type { CampaignLeaderboardEntry } from '@/store/api/safePass'
 
 jest.mock('@/hooks/useChainId')
 
diff --git a/src/components/common/SafeTokenWidget/index.tsx b/src/components/common/SafeTokenWidget/index.tsx
index ee8a9869d1..1ca32b9663 100644
--- a/src/components/common/SafeTokenWidget/index.tsx
+++ b/src/components/common/SafeTokenWidget/index.tsx
@@ -14,7 +14,7 @@ import css from './styles.module.css'
 import useSafeAddress from '@/hooks/useSafeAddress'
 import { skipToken } from '@reduxjs/toolkit/query/react'
 import { useDarkMode } from '@/hooks/useDarkMode'
-import { useGetOwnGlobalCampaignRankQuery } from '@/store/safePass'
+import { useGetOwnGlobalCampaignRankQuery } from '@/store/api/safePass'
 import { formatAmount } from '@/utils/formatNumber'
 
 const TOKEN_DECIMALS = 18
diff --git a/src/components/transactions/SingleTx/index.tsx b/src/components/transactions/SingleTx/index.tsx
index c2bd9e52a6..034630d3e9 100644
--- a/src/components/transactions/SingleTx/index.tsx
+++ b/src/components/transactions/SingleTx/index.tsx
@@ -13,7 +13,7 @@ import ExpandableTransactionItem, {
 } from '@/components/transactions/TxListItem/ExpandableTransactionItem'
 import GroupLabel from '../GroupLabel'
 import { isMultisigDetailedExecutionInfo } from '@/utils/transaction-guards'
-import { useGetTransactionDetailsQuery } from '@/store/gateway'
+import { useGetTransactionDetailsQuery } from '@/store/api/gateway'
 import { skipToken } from '@reduxjs/toolkit/query/react'
 import { asError } from '@/services/exceptions/utils'
 
diff --git a/src/components/transactions/TxDetails/index.tsx b/src/components/transactions/TxDetails/index.tsx
index 1387362d0b..d64a0d225f 100644
--- a/src/components/transactions/TxDetails/index.tsx
+++ b/src/components/transactions/TxDetails/index.tsx
@@ -33,7 +33,7 @@ import useIsPending from '@/hooks/useIsPending'
 import { isImitation, isTrustedTx } from '@/utils/transactions'
 import { useHasFeature } from '@/hooks/useChains'
 import { FEATURES } from '@/utils/chains'
-import { useGetTransactionDetailsQuery } from '@/store/gateway'
+import { useGetTransactionDetailsQuery } from '@/store/api/gateway'
 import { asError } from '@/services/exceptions/utils'
 import { POLLING_INTERVAL } from '@/config/constants'
 
diff --git a/src/components/tx-flow/flows/ExecuteBatch/ReviewBatch.tsx b/src/components/tx-flow/flows/ExecuteBatch/ReviewBatch.tsx
index 6739daad92..9f4c838a3d 100644
--- a/src/components/tx-flow/flows/ExecuteBatch/ReviewBatch.tsx
+++ b/src/components/tx-flow/flows/ExecuteBatch/ReviewBatch.tsx
@@ -36,7 +36,7 @@ import WalletRejectionError from '@/components/tx/SignOrExecuteForm/WalletReject
 import useUserNonce from '@/components/tx/AdvancedParams/useUserNonce'
 import { getLatestSafeVersion } from '@/utils/chains'
 import { HexEncodedData } from '@/components/transactions/HexEncodedData'
-import { useGetMultipleTransactionDetailsQuery } from '@/store/gateway'
+import { useGetMultipleTransactionDetailsQuery } from '@/store/api/gateway'
 import { skipToken } from '@reduxjs/toolkit/query/react'
 import NetworkWarning from '@/components/new-safe/create/NetworkWarning'
 
diff --git a/src/components/tx/DecodedTx/index.tsx b/src/components/tx/DecodedTx/index.tsx
index 44d8c3087a..618893fc8b 100644
--- a/src/components/tx/DecodedTx/index.tsx
+++ b/src/components/tx/DecodedTx/index.tsx
@@ -13,7 +13,7 @@ import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
 import DecodedData from '@/components/transactions/TxDetails/TxData/DecodedData'
 import accordionCss from '@/styles/accordion.module.css'
 import HelpToolTip from './HelpTooltip'
-import { useGetTransactionDetailsQuery } from '@/store/gateway'
+import { useGetTransactionDetailsQuery } from '@/store/api/gateway'
 import { skipToken } from '@reduxjs/toolkit/query/react'
 import { asError } from '@/services/exceptions/utils'
 
diff --git a/src/components/tx/SignOrExecuteForm/index.tsx b/src/components/tx/SignOrExecuteForm/index.tsx
index 1c2a0b4a53..722f156e3f 100644
--- a/src/components/tx/SignOrExecuteForm/index.tsx
+++ b/src/components/tx/SignOrExecuteForm/index.tsx
@@ -39,7 +39,7 @@ import { MigrateToL2Information } from './MigrateToL2Information'
 import { extractMigrationL2MasterCopyAddress } from '@/utils/transactions'
 
 import type { TransactionDetails } from '@safe-global/safe-gateway-typescript-sdk'
-import { useGetTransactionDetailsQuery, useLazyGetTransactionDetailsQuery } from '@/store/gateway'
+import { useGetTransactionDetailsQuery, useLazyGetTransactionDetailsQuery } from '@/store/api/gateway'
 import { skipToken } from '@reduxjs/toolkit/query/react'
 import NetworkWarning from '@/components/new-safe/create/NetworkWarning'
 
diff --git a/src/components/welcome/MyAccounts/AccountItem.tsx b/src/components/welcome/MyAccounts/AccountItem.tsx
index e33e23d627..32fff77b8c 100644
--- a/src/components/welcome/MyAccounts/AccountItem.tsx
+++ b/src/components/welcome/MyAccounts/AccountItem.tsx
@@ -26,7 +26,7 @@ import FiatValue from '@/components/common/FiatValue'
 import QueueActions from './QueueActions'
 import { useGetHref } from './useGetHref'
 import { extractCounterfactualSafeSetup, isPredictedSafeProps } from '@/features/counterfactual/utils'
-import { useGetSafeOverviewQuery } from '@/store/safeOverviews'
+import { useGetSafeOverviewQuery } from '@/store/api/gateway'
 import useWallet from '@/hooks/wallets/useWallet'
 import { skipToken } from '@reduxjs/toolkit/query'
 
diff --git a/src/components/welcome/MyAccounts/MultiAccountItem.tsx b/src/components/welcome/MyAccounts/MultiAccountItem.tsx
index 7a9950916a..a265d7ad5a 100644
--- a/src/components/welcome/MyAccounts/MultiAccountItem.tsx
+++ b/src/components/welcome/MyAccounts/MultiAccountItem.tsx
@@ -33,7 +33,7 @@ import { AddNetworkButton } from './AddNetworkButton'
 import { isPredictedSafeProps } from '@/features/counterfactual/utils'
 import ChainIndicator from '@/components/common/ChainIndicator'
 import MultiAccountContextMenu from '@/components/sidebar/SafeListContextMenu/MultiAccountContextMenu'
-import { useGetMultipleSafeOverviewsQuery } from '@/store/safeOverviews'
+import { useGetMultipleSafeOverviewsQuery } from '@/store/api/gateway'
 import useWallet from '@/hooks/wallets/useWallet'
 import { selectCurrency } from '@/store/settingsSlice'
 
diff --git a/src/features/speedup/components/SpeedUpModal.tsx b/src/features/speedup/components/SpeedUpModal.tsx
index 50a641b1b1..b529480268 100644
--- a/src/features/speedup/components/SpeedUpModal.tsx
+++ b/src/features/speedup/components/SpeedUpModal.tsx
@@ -27,7 +27,7 @@ import { getTransactionTrackingType } from '@/services/analytics/tx-tracking'
 import { trackError } from '@/services/exceptions'
 import ErrorCodes from '@/services/exceptions/ErrorCodes'
 import CheckWallet from '@/components/common/CheckWallet'
-import { useLazyGetTransactionDetailsQuery } from '@/store/gateway'
+import { useLazyGetTransactionDetailsQuery } from '@/store/api/gateway'
 import NetworkWarning from '@/components/new-safe/create/NetworkWarning'
 
 type Props = {
diff --git a/src/features/stake/components/StakePage/index.tsx b/src/features/stake/components/StakePage/index.tsx
index b42b388f44..e6c4b855ec 100644
--- a/src/features/stake/components/StakePage/index.tsx
+++ b/src/features/stake/components/StakePage/index.tsx
@@ -4,7 +4,7 @@ import WidgetDisclaimer from '@/components/common/WidgetDisclaimer'
 import useStakeConsent from '@/features/stake/useStakeConsent'
 import StakingWidget from '../StakingWidget'
 import { useRouter } from 'next/router'
-import { useGetIsSanctionedQuery } from '@/store/ofac'
+import { useGetIsSanctionedQuery } from '@/store/api/ofac'
 import { skipToken } from '@reduxjs/toolkit/query/react'
 import useWallet from '@/hooks/wallets/useWallet'
 import useSafeInfo from '@/hooks/useSafeInfo'
diff --git a/src/features/swap/index.tsx b/src/features/swap/index.tsx
index 9ac20f238d..12735115ba 100644
--- a/src/features/swap/index.tsx
+++ b/src/features/swap/index.tsx
@@ -37,7 +37,7 @@ import {
 import { calculateFeePercentageInBps } from '@/features/swap/helpers/fee'
 import { UiOrderTypeToOrderType } from '@/features/swap/helpers/utils'
 import { FEATURES } from '@/utils/chains'
-import { useGetIsSanctionedQuery } from '@/store/ofac'
+import { useGetIsSanctionedQuery } from '@/store/api/ofac'
 import { skipToken } from '@reduxjs/toolkit/query/react'
 import { getKeyWithTrueValue } from '@/utils/helpers'
 
diff --git a/src/hooks/useDelegates.ts b/src/hooks/useDelegates.ts
index 74c643ce33..c669ed93c0 100644
--- a/src/hooks/useDelegates.ts
+++ b/src/hooks/useDelegates.ts
@@ -1,6 +1,6 @@
 import useSafeInfo from '@/hooks/useSafeInfo'
 import useWallet from '@/hooks/wallets/useWallet'
-import { useGetDelegatesQuery } from '@/store/gateway'
+import { useGetDelegatesQuery } from '@/store/api/gateway'
 import { skipToken } from '@reduxjs/toolkit/query/react'
 
 const useDelegates = () => {
diff --git a/src/hooks/useTxNotifications.ts b/src/hooks/useTxNotifications.ts
index 5311a8e8a6..c778e43d00 100644
--- a/src/hooks/useTxNotifications.ts
+++ b/src/hooks/useTxNotifications.ts
@@ -14,7 +14,7 @@ import useSafeAddress from './useSafeAddress'
 import { getExplorerLink } from '@/utils/gateway'
 import { isWalletRejection } from '@/utils/wallets'
 import { getTxLink } from '@/utils/tx-link'
-import { useLazyGetTransactionDetailsQuery } from '@/store/gateway'
+import { useLazyGetTransactionDetailsQuery } from '@/store/api/gateway'
 
 const TxNotifications = {
   [TxEvent.SIGN_FAILED]: 'Failed to sign. Please try again.',
diff --git a/src/hooks/useTxTracking.ts b/src/hooks/useTxTracking.ts
index 44a1e570dd..836bb81be9 100644
--- a/src/hooks/useTxTracking.ts
+++ b/src/hooks/useTxTracking.ts
@@ -2,7 +2,7 @@ import { trackEvent, WALLET_EVENTS } from '@/services/analytics'
 import { TxEvent, txSubscribe } from '@/services/tx/txEvents'
 import { useEffect } from 'react'
 import useChainId from './useChainId'
-import { useLazyGetTransactionDetailsQuery } from '@/store/gateway'
+import { useLazyGetTransactionDetailsQuery } from '@/store/api/gateway'
 
 const events = {
   [TxEvent.SIGNED]: WALLET_EVENTS.OFFCHAIN_SIGNATURE,
diff --git a/src/store/__tests__/safeOverviews.test.ts b/src/store/__tests__/safeOverviews.test.ts
index 137c41003d..a7858b6ee7 100644
--- a/src/store/__tests__/safeOverviews.test.ts
+++ b/src/store/__tests__/safeOverviews.test.ts
@@ -1,5 +1,5 @@
 import { renderHook, waitFor } from '@/tests/test-utils'
-import { useGetMultipleSafeOverviewsQuery, useGetSafeOverviewQuery } from '../safeOverviews'
+import { useGetMultipleSafeOverviewsQuery, useGetSafeOverviewQuery } from '../api/gateway'
 import { faker } from '@faker-js/faker'
 import { getSafeOverviews } from '@safe-global/safe-gateway-typescript-sdk'
 
@@ -247,5 +247,75 @@ describe('safeOverviews', () => {
         expect(result.current.isLoading).toBeFalsy()
       })
     })
+
+    it('Should split big batches into multiple requests', async () => {
+      // Requests overviews for 15 Safes at once
+      const request = {
+        currency: 'usd',
+        safes: [
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+          { address: faker.finance.ethereumAddress(), chainId: '1', isWatchlist: false },
+        ],
+      }
+
+      const firstBatchOverviews = request.safes.slice(0, 10).map((safe) => ({
+        address: { value: safe.address },
+        chainId: '1',
+        awaitingConfirmation: null,
+        fiatTotal: faker.string.numeric({ length: { min: 1, max: 6 } }),
+        owners: [{ value: faker.finance.ethereumAddress() }],
+        threshold: 1,
+        queued: 0,
+      }))
+
+      const secondBatchOverviews = request.safes.slice(10).map((safe) => ({
+        address: { value: safe.address },
+        chainId: '1',
+        awaitingConfirmation: null,
+        fiatTotal: faker.string.numeric({ length: { min: 1, max: 6 } }),
+        owners: [{ value: faker.finance.ethereumAddress() }],
+        threshold: 1,
+        queued: 0,
+      }))
+
+      // Mock two fetch requests for the 2 batches
+      mockedGetSafeOverviews.mockResolvedValueOnce(firstBatchOverviews).mockResolvedValueOnce(secondBatchOverviews)
+
+      const { result } = renderHook(() => useGetMultipleSafeOverviewsQuery(request))
+
+      // Request should get queued and remain loading for the queue seconds
+      expect(result.current.isLoading).toBeTruthy()
+
+      await waitFor(() => {
+        expect(result.current.isLoading).toBeFalsy()
+        expect(result.current.error).toBeUndefined()
+        expect(result.current.data).toEqual([...firstBatchOverviews, ...secondBatchOverviews])
+      })
+
+      // Expect that the correct requests were sent
+      expect(mockedGetSafeOverviews).toHaveBeenCalledTimes(2)
+      expect(mockedGetSafeOverviews).toHaveBeenCalledWith(
+        request.safes.slice(0, 10).map((safe) => `1:${safe.address}`),
+        { currency: 'usd', exclude_spam: true, trusted: true },
+      )
+
+      expect(mockedGetSafeOverviews).toHaveBeenCalledWith(
+        request.safes.slice(10).map((safe) => `1:${safe.address}`),
+        { currency: 'usd', exclude_spam: true, trusted: true },
+      )
+    })
   })
 })
diff --git a/src/store/gateway.ts b/src/store/api/gateway/index.ts
similarity index 91%
rename from src/store/gateway.ts
rename to src/store/api/gateway/index.ts
index 3b027245b9..295279353a 100644
--- a/src/store/gateway.ts
+++ b/src/store/api/gateway/index.ts
@@ -5,8 +5,9 @@ import type { BaseQueryFn } from '@reduxjs/toolkit/dist/query/baseQueryTypes'
 import type { FetchBaseQueryError } from '@reduxjs/toolkit/dist/query/react'
 import { getDelegates } from '@safe-global/safe-gateway-typescript-sdk'
 import type { DelegateResponse } from '@safe-global/safe-gateway-typescript-sdk/dist/types/delegates'
+import { safeOverviewEndpoints } from './safeOverviews'
 
-const noopBaseQuery: BaseQueryFn<
+export const noopBaseQuery: BaseQueryFn<
   unknown, // QueryArg type
   unknown, // ResultType
   FetchBaseQueryError, // ErrorType
@@ -48,6 +49,7 @@ export const gatewayApi = createApi({
         }
       },
     }),
+    ...safeOverviewEndpoints(builder),
   }),
 })
 
@@ -56,4 +58,6 @@ export const {
   useGetMultipleTransactionDetailsQuery,
   useLazyGetTransactionDetailsQuery,
   useGetDelegatesQuery,
+  useGetSafeOverviewQuery,
+  useGetMultipleSafeOverviewsQuery,
 } = gatewayApi
diff --git a/src/store/safeOverviews.ts b/src/store/api/gateway/safeOverviews.ts
similarity index 61%
rename from src/store/safeOverviews.ts
rename to src/store/api/gateway/safeOverviews.ts
index e3632d8cb0..8caa1ef00a 100644
--- a/src/store/safeOverviews.ts
+++ b/src/store/api/gateway/safeOverviews.ts
@@ -1,13 +1,11 @@
-import { createApi } from '@reduxjs/toolkit/query/react'
+import { type BaseQueryFn, type FetchBaseQueryError, type EndpointBuilder } from '@reduxjs/toolkit/query/react'
 
 import { type SafeOverview, getSafeOverviews } from '@safe-global/safe-gateway-typescript-sdk'
 import { sameAddress } from '@/utils/addresses'
-import type { RootState } from '.'
-import { selectCurrency } from './settingsSlice'
+import type { RootState } from '../..'
+import { selectCurrency } from '../../settingsSlice'
 import { type SafeItem } from '@/components/welcome/MyAccounts/useAllSafes'
 
-const noopBaseQuery = async () => ({ data: null })
-
 type SafeOverviewQueueItem = {
   safeAddress: string
   walletAddress?: string
@@ -114,50 +112,53 @@ type MultiOverviewQueryParams = {
   safes: SafeItem[]
 }
 
-export const safeOverviewApi = createApi({
-  reducerPath: 'safeOverviewApi',
-  baseQuery: noopBaseQuery,
-  endpoints: (builder) => ({
-    getSafeOverview: builder.query<
-      SafeOverview | undefined,
-      { safeAddress: string; walletAddress?: string; chainId: string }
-    >({
-      async queryFn({ safeAddress, walletAddress, chainId }, { getState }) {
-        const state = getState()
-        const currency = selectCurrency(state as RootState)
-
-        try {
-          const safeOverview = await batchedFetcher.getOverview({ chainId, currency, walletAddress, safeAddress })
-          return { data: safeOverview }
-        } catch (error) {
-          return { error: { status: 'CUSTOM_ERROR', data: (error as Error).message } }
-        }
-      },
-    }),
-    getMultipleSafeOverviews: builder.query<SafeOverview[], MultiOverviewQueryParams>({
-      async queryFn(params) {
-        const { safes, walletAddress, currency } = params
-
-        try {
-          const promisedSafeOverviews = safes.map((safe) =>
-            batchedFetcher.getOverview({
-              chainId: safe.chainId,
-              safeAddress: safe.address,
-              currency,
-              walletAddress,
-            }),
-          )
-          const safeOverviews = await Promise.all(promisedSafeOverviews)
-          return { data: safeOverviews.filter(Boolean) as SafeOverview[] }
-        } catch (error) {
-          return { error: { status: 'CUSTOM_ERROR', data: (error as Error).message } }
-        }
-      },
-    }),
+export const safeOverviewEndpoints = (
+  builder: EndpointBuilder<
+    BaseQueryFn<
+      unknown, // QueryArg type
+      unknown, // ResultType
+      FetchBaseQueryError, // ErrorType
+      {}, // DefinitionExtraOptions
+      {} // Meta
+    >,
+    never,
+    'gatewayApi'
+  >,
+) => ({
+  getSafeOverview: builder.query<
+    SafeOverview | undefined,
+    { safeAddress: string; walletAddress?: string; chainId: string }
+  >({
+    async queryFn({ safeAddress, walletAddress, chainId }, { getState }) {
+      const state = getState()
+      const currency = selectCurrency(state as RootState)
+
+      try {
+        const safeOverview = await batchedFetcher.getOverview({ chainId, currency, walletAddress, safeAddress })
+        return { data: safeOverview }
+      } catch (error) {
+        return { error: { status: 'CUSTOM_ERROR', error: (error as Error).message } }
+      }
+    },
+  }),
+  getMultipleSafeOverviews: builder.query<SafeOverview[], MultiOverviewQueryParams>({
+    async queryFn(params) {
+      const { safes, walletAddress, currency } = params
+
+      try {
+        const promisedSafeOverviews = safes.map((safe) =>
+          batchedFetcher.getOverview({
+            chainId: safe.chainId,
+            safeAddress: safe.address,
+            currency,
+            walletAddress,
+          }),
+        )
+        const safeOverviews = await Promise.all(promisedSafeOverviews)
+        return { data: safeOverviews.filter(Boolean) as SafeOverview[] }
+      } catch (error) {
+        return { error: { status: 'CUSTOM_ERROR', error: (error as Error).message } }
+      }
+    },
   }),
 })
-
-// Export hooks for usage in functional components, which are
-// auto-generated based on the defined endpoints
-export const { useGetSafeOverviewQuery, useLazyGetSafeOverviewQuery, useGetMultipleSafeOverviewsQuery } =
-  safeOverviewApi
diff --git a/src/store/ofac.ts b/src/store/api/ofac.ts
similarity index 98%
rename from src/store/ofac.ts
rename to src/store/api/ofac.ts
index 0982ce5c9d..3e4be9d4b2 100644
--- a/src/store/ofac.ts
+++ b/src/store/api/ofac.ts
@@ -2,7 +2,7 @@ import { createApi } from '@reduxjs/toolkit/query/react'
 import { selectChainById } from '@/store/chainsSlice'
 import { Contract } from 'ethers'
 import { createWeb3ReadOnly } from '@/hooks/wallets/web3'
-import type { RootState } from '.'
+import type { RootState } from '..'
 import { CHAINALYSIS_OFAC_CONTRACT } from '@/config/constants'
 import chains from '@/config/chains'
 
diff --git a/src/store/safePass.ts b/src/store/api/safePass.ts
similarity index 100%
rename from src/store/safePass.ts
rename to src/store/api/safePass.ts
diff --git a/src/store/index.ts b/src/store/index.ts
index f3916f951c..1dcd5903fb 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -24,8 +24,8 @@ import {
 } from './slices'
 import * as slices from './slices'
 import * as hydrate from './useHydrateStore'
-import { ofacApi } from '@/store/ofac'
-import { safePassApi } from './safePass'
+import { ofacApi } from '@/store/api/ofac'
+import { safePassApi } from './api/safePass'
 import { metadata } from '@/markdown/terms/terms.md'
 
 const rootReducer = combineReducers({
@@ -53,7 +53,6 @@ const rootReducer = combineReducers({
   [ofacApi.reducerPath]: ofacApi.reducer,
   [safePassApi.reducerPath]: safePassApi.reducer,
   [slices.gatewayApi.reducerPath]: slices.gatewayApi.reducer,
-  [slices.safeOverviewApi.reducerPath]: slices.safeOverviewApi.reducer,
 })
 
 const persistedSlices: (keyof Partial<RootState>)[] = [
@@ -84,7 +83,6 @@ const middleware: Middleware<{}, RootState>[] = [
   ofacApi.middleware,
   safePassApi.middleware,
   slices.gatewayApi.middleware,
-  slices.safeOverviewApi.middleware,
 ]
 const listeners = [safeMessagesListener, txHistoryListener, txQueueListener, swapOrderListener, swapOrderStatusListener]
 
diff --git a/src/store/slices.ts b/src/store/slices.ts
index d105316365..a36e3c1806 100644
--- a/src/store/slices.ts
+++ b/src/store/slices.ts
@@ -19,5 +19,5 @@ export * from './batchSlice'
 export * from '@/features/counterfactual/store/undeployedSafesSlice'
 export * from '@/features/swap/store/swapParamsSlice'
 export * from './swapOrderSlice'
-export * from './gateway'
-export * from './safeOverviews'
+export * from './api/gateway'
+export * from './api/gateway/safeOverviews'