diff --git a/src/state/slices/opportunitiesSlice/selectors/selectors.test.ts b/src/state/slices/opportunitiesSlice/selectors/selectors.test.ts
index eb11e885866..b7245809e45 100644
--- a/src/state/slices/opportunitiesSlice/selectors/selectors.test.ts
+++ b/src/state/slices/opportunitiesSlice/selectors/selectors.test.ts
@@ -47,6 +47,7 @@ describe('opportunitiesSlice selectors', () => {
         supportedChainIds: [],
       },
       wallet,
+      enabledAccountIds: [gomesAccountId, fauxmesAccountId, catpuccinoAccountId],
     },
   }
   describe('selects ID/s', () => {
@@ -65,6 +66,7 @@ describe('opportunitiesSlice selectors', () => {
       },
       ids: [gomesAccountId, fauxmesAccountId],
     }
+    const enabledAccountIds = [gomesAccountId, fauxmesAccountId]
     const lp = {
       ...initialState.lp,
       byAccountId: {
@@ -116,6 +118,7 @@ describe('opportunitiesSlice selectors', () => {
         ...mockBaseState.portfolio,
         accountBalances,
         accountMetadata,
+        enabledAccountIds,
       },
       opportunities: {
         ...initialState,
diff --git a/src/state/slices/portfolioSlice/__snapshots__/portfolioSlice.test.ts.snap b/src/state/slices/portfolioSlice/__snapshots__/portfolioSlice.test.ts.snap
index b4a4c9ae347..164a07f3580 100644
--- a/src/state/slices/portfolioSlice/__snapshots__/portfolioSlice.test.ts.snap
+++ b/src/state/slices/portfolioSlice/__snapshots__/portfolioSlice.test.ts.snap
@@ -30,7 +30,7 @@ exports[`portfolioSlice > reducers > upsertPortfolio > Bitcoin > should update s
     ],
   },
   "enabledAccountIds": [
-    "bip122:000000000019d6689c085ae165831e93:zpub6qk8s2NQsYG6X2Mm6iU2ii3yTAqDb2XqnMu9vo2WjvqwjSvjjiYQQveYXbPxrnRT5Yb5p0x934be745172066EDF795ffc5EA9F28f19b440c637BaBw1wowPwbS8fj7uCfj3UhqhD2LLbvY6Ni1w"
+    "bip122:000000000019d6689c085ae165831e93:zpub6qk8s2NQsYG6X2Mm6iU2ii3yTAqDb2XqnMu9vo2WjvqwjSvjjiYQQveYXbPxrnRT5Yb5p0x934be745172066EDF795ffc5EA9F28f19b440c637BaBw1wowPwbS8fj7uCfj3UhqhD2LLbvY6Ni1w",
   ],
   "wallet": {
     "byId": {},
diff --git a/src/state/slices/portfolioSlice/portfolioSlice.test.ts b/src/state/slices/portfolioSlice/portfolioSlice.test.ts
index ca308c6f269..ddb993e3b07 100644
--- a/src/state/slices/portfolioSlice/portfolioSlice.test.ts
+++ b/src/state/slices/portfolioSlice/portfolioSlice.test.ts
@@ -63,9 +63,11 @@ describe('portfolioSlice', () => {
             },
           })
 
-          store.dispatch(
-            portfolioSlice.actions.upsertPortfolio(mockUpsertPortfolio([ethAccount], assetIds)),
-          )
+          const portfolio = mockUpsertPortfolio([ethAccount], assetIds)
+          store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+          for (const accountId of portfolio.accounts.ids) {
+            store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+          }
 
           expect(store.getState().portfolio).toMatchSnapshot()
         })
@@ -88,11 +90,11 @@ describe('portfolioSlice', () => {
             },
           })
 
-          store.dispatch(
-            portfolioSlice.actions.upsertPortfolio(
-              mockUpsertPortfolio([ethAccount, ethAccount2], assetIds),
-            ),
-          )
+          const portfolio = mockUpsertPortfolio([ethAccount, ethAccount2], assetIds)
+          store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+          for (const accountId of portfolio.accounts.ids) {
+            store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+          }
 
           expect(store.getState().portfolio).toMatchSnapshot()
         })
@@ -107,9 +109,11 @@ describe('portfolioSlice', () => {
             },
           })
 
-          store.dispatch(
-            portfolioSlice.actions.upsertPortfolio(mockUpsertPortfolio([btcAccount], assetIds)),
-          )
+          const portfolio = mockUpsertPortfolio([btcAccount], assetIds)
+          store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+          for (const accountId of portfolio.accounts.ids) {
+            store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+          }
 
           expect(store.getState().portfolio).toMatchSnapshot()
         })
@@ -129,11 +133,11 @@ describe('portfolioSlice', () => {
             },
           })
 
-          store.dispatch(
-            portfolioSlice.actions.upsertPortfolio(
-              mockUpsertPortfolio([btcAccount, btcAccount2], assetIds),
-            ),
-          )
+          const portfolio = mockUpsertPortfolio([btcAccount, btcAccount2], assetIds)
+          store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+          for (const accountId of portfolio.accounts.ids) {
+            store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+          }
 
           expect(store.getState().portfolio).toMatchSnapshot()
         })
@@ -180,11 +184,11 @@ describe('portfolioSlice', () => {
             },
           })
 
-          store.dispatch(
-            portfolioSlice.actions.upsertPortfolio(
-              mockUpsertPortfolio([ethAccount, ethAccount2, btcAccount], assetIds),
-            ),
-          )
+          const portfolio = mockUpsertPortfolio([ethAccount, ethAccount2, btcAccount], assetIds)
+          store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+          for (const accountId of portfolio.accounts.ids) {
+            store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+          }
 
           expect(store.getState().portfolio).toMatchSnapshot()
         })
@@ -221,11 +225,11 @@ describe('portfolioSlice', () => {
             },
           })
 
-          store.dispatch(
-            portfolioSlice.actions.upsertPortfolio(
-              mockUpsertPortfolio([ethAccount, btcAccount], assetIds),
-            ),
-          )
+          const portfolio = mockUpsertPortfolio([ethAccount, btcAccount], assetIds)
+          store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+          for (const accountId of portfolio.accounts.ids) {
+            store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+          }
 
           expect(store.getState().portfolio).toMatchSnapshot()
         })
@@ -258,11 +262,11 @@ describe('portfolioSlice', () => {
         )
 
         // dispatch portfolio data
-        store.dispatch(
-          portfolioSlice.actions.upsertPortfolio(
-            mockUpsertPortfolio([ethAccount, ethAccount2, btcAccount], assetIds),
-          ),
-        )
+        const portfolio = mockUpsertPortfolio([ethAccount, ethAccount2, btcAccount], assetIds)
+        store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+        for (const accountId of portfolio.accounts.ids) {
+          store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+        }
 
         const ethMarketData = mockMarketData()
         const foxMarketData = mockMarketData({ price: '1' })
@@ -311,11 +315,12 @@ describe('portfolioSlice', () => {
         )
 
         // dispatch portfolio data
-        store.dispatch(
-          portfolioSlice.actions.upsertPortfolio(
-            mockUpsertPortfolio([ethAccount, ethAccount2, btcAccount], assetIds),
-          ),
-        )
+        const portfolio = mockUpsertPortfolio([ethAccount, ethAccount2, btcAccount], assetIds)
+        store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+        for (const accountId of portfolio.accounts.ids) {
+          store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+        }
+
         const ethMarketData = mockMarketData({ price: null })
         const foxMarketData = mockMarketData({ price: null })
 
@@ -365,11 +370,11 @@ describe('portfolioSlice', () => {
       )
 
       // dispatch portfolio data
-      store.dispatch(
-        portfolioSlice.actions.upsertPortfolio(
-          mockUpsertPortfolio([ethAccount, ethAccount2], assetIds),
-        ),
-      )
+      const portfolio = mockUpsertPortfolio([ethAccount, ethAccount2], assetIds)
+      store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+      for (const accountId of portfolio.accounts.ids) {
+        store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+      }
 
       it('can select crypto fiat account balance', () => {
         // dispatch market data
@@ -450,11 +455,11 @@ describe('portfolioSlice', () => {
       )
 
       // dispatch portfolio data
-      store.dispatch(
-        portfolioSlice.actions.upsertPortfolio(
-          mockUpsertPortfolio([btcAccount, btcAccount2, btcAccount3], assetIds),
-        ),
-      )
+      const portfolio = mockUpsertPortfolio([btcAccount, btcAccount2, btcAccount3], assetIds)
+      store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+      for (const accountId of portfolio.accounts.ids) {
+        store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+      }
 
       // dispatch market data
       const btcMarketData = mockMarketData({ price: '10000' })
@@ -495,11 +500,11 @@ describe('portfolioSlice', () => {
         }),
       )
       // dispatch portfolio data
-      store.dispatch(
-        portfolioSlice.actions.upsertPortfolio(
-          mockUpsertPortfolio([ethAccount, ethAccount2], assetIds),
-        ),
-      )
+      const portfolio = mockUpsertPortfolio([ethAccount, ethAccount2], assetIds)
+      store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+      for (const accountId of portfolio.accounts.ids) {
+        store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+      }
 
       store.dispatch(
         portfolioSlice.actions.upsertAccountMetadata({
@@ -574,11 +579,11 @@ describe('portfolioSlice', () => {
       )
 
       // dispatch portfolio data
-      store.dispatch(
-        portfolioSlice.actions.upsertPortfolio(
-          mockUpsertPortfolio([ethAccount, ethAccount2], assetIds),
-        ),
-      )
+      const portfolio = mockUpsertPortfolio([ethAccount, ethAccount2], assetIds)
+      store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+      for (const accountId of portfolio.accounts.ids) {
+        store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+      }
 
       // dispatch market data
       const ethMarketData = mockMarketData({ price: '1000' })
@@ -646,11 +651,11 @@ describe('portfolioSlice', () => {
       )
 
       // dispatch portfolio data
-      store.dispatch(
-        portfolioSlice.actions.upsertPortfolio(
-          mockUpsertPortfolio([ethAccount, ethAccount2], assetIds),
-        ),
-      )
+      const portfolio = mockUpsertPortfolio([ethAccount, ethAccount2], assetIds)
+      store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+      for (const accountId of portfolio.accounts.ids) {
+        store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+      }
 
       // dispatch market data
       const ethMarketData = mockMarketData({ price: '1000' })
@@ -697,9 +702,11 @@ describe('portfolioSlice', () => {
       })
 
       // dispatch portfolio data
-      store.dispatch(
-        portfolioSlice.actions.upsertPortfolio(mockUpsertPortfolio([ethAccount], assetIds)),
-      )
+      const portfolio = mockUpsertPortfolio([ethAccount], assetIds)
+      store.dispatch(portfolioSlice.actions.upsertPortfolio(portfolio))
+      for (const accountId of portfolio.accounts.ids) {
+        store.dispatch(portfolioSlice.actions.enableAccountId(accountId))
+      }
 
       // dispatch market data
       const ethMarketData = mockMarketData({ price: '1000' })