diff --git a/apps/frontend/src/app/5_pages/MarketMakingPage/MarketMakingPage.tsx b/apps/frontend/src/app/5_pages/MarketMakingPage/MarketMakingPage.tsx
index bddca4d41..5e4beca8f 100644
--- a/apps/frontend/src/app/5_pages/MarketMakingPage/MarketMakingPage.tsx
+++ b/apps/frontend/src/app/5_pages/MarketMakingPage/MarketMakingPage.tsx
@@ -2,6 +2,7 @@ import React, { FC } from 'react';
 
 import { RSK_CHAIN_ID } from '../../../config/chains';
 
+import { CrocContextProvider } from '../../../contexts/CrocContext';
 import { useCurrentChain } from '../../../hooks/useChainStore';
 import { AmbientMarketMaking } from './components/AmbientMarketMaking/AmbientMarketMaking';
 import { MarketMaking } from './components/MarketMaking/MarketMaking';
@@ -10,7 +11,11 @@ const MarketMakingPage: FC = () => {
   const currentChainId = useCurrentChain();
 
   if (currentChainId !== RSK_CHAIN_ID) {
-    return <AmbientMarketMaking />;
+    return (
+      <CrocContextProvider>
+        <AmbientMarketMaking />
+      </CrocContextProvider>
+    );
   }
   return <MarketMaking />;
 };
diff --git a/apps/frontend/src/app/5_pages/MarketMakingPage/components/PoolsTable/components/PoolsTableAction/PoolsTableAction.tsx b/apps/frontend/src/app/5_pages/MarketMakingPage/components/PoolsTable/components/PoolsTableAction/PoolsTableAction.tsx
index 98609224d..aca47a13e 100644
--- a/apps/frontend/src/app/5_pages/MarketMakingPage/components/PoolsTable/components/PoolsTableAction/PoolsTableAction.tsx
+++ b/apps/frontend/src/app/5_pages/MarketMakingPage/components/PoolsTable/components/PoolsTableAction/PoolsTableAction.tsx
@@ -13,11 +13,9 @@ import { Decimal } from '@sovryn/utils';
 
 import { useAccount } from '../../../../../../../hooks/useAccount';
 import { useBlockNumber } from '../../../../../../../hooks/useBlockNumber';
-import { useCurrentChain } from '../../../../../../../hooks/useChainStore';
 import { useMaintenance } from '../../../../../../../hooks/useMaintenance';
 import { translations } from '../../../../../../../locales/i18n';
 import { COMMON_SYMBOLS } from '../../../../../../../utils/asset';
-import { getChainById } from '../../../../../../../utils/chain';
 import { useCheckPoolMaintenance } from '../../../../hooks/useCheckPoolMaintenance';
 import { useGetUserInfo } from '../../../../hooks/useGetUserInfo';
 import { AmmLiquidityPool } from '../../../../utils/AmmLiquidityPool';
@@ -28,10 +26,6 @@ type PoolsTableActionProps = {
 };
 
 export const PoolsTableAction: FC<PoolsTableActionProps> = ({ pool }) => {
-  const chainId = useCurrentChain();
-  const chain = useMemo(() => getChainById(chainId), [chainId]);
-  const isBobChain = useMemo(() => chain?.label === 'BOB', [chain?.label]);
-
   const { account } = useAccount();
   const { value: block } = useBlockNumber();
 
@@ -116,7 +110,7 @@ export const PoolsTableAction: FC<PoolsTableActionProps> = ({ pool }) => {
                   style={ButtonStyle.primary}
                   size={ButtonSize.small}
                   text={
-                    isBobChain && pool.assetA === COMMON_SYMBOLS.SOV
+                    pool.assetA === COMMON_SYMBOLS.SOV
                       ? t(translations.common.withdraw)
                       : t(translations.common.deposit)
                   }
@@ -139,16 +133,13 @@ export const PoolsTableAction: FC<PoolsTableActionProps> = ({ pool }) => {
                 onClick={handleAdjustClick}
               />
             )}
+            <p>{actionLocked && 'action locked'}</p>
           </>
         }
       />
 
       <AdjustAndDepositModal
-        isOpen={
-          isModalOpen &&
-          isBobChain &&
-          ![COMMON_SYMBOLS.DLLR, COMMON_SYMBOLS.SOV].includes(pool.assetA)
-        }
+        isOpen={isModalOpen}
         onClose={handleClose}
         pool={pool}
         isInitialDeposit={isInitialDeposit}
diff --git a/apps/frontend/src/constants/infrastructure/rsk.ts b/apps/frontend/src/constants/infrastructure/rsk.ts
index b7a6a291a..a5255a31a 100644
--- a/apps/frontend/src/constants/infrastructure/rsk.ts
+++ b/apps/frontend/src/constants/infrastructure/rsk.ts
@@ -2,14 +2,8 @@ import { Environments } from '../../types/global';
 
 export const RSK = {
   rpc: {
-    [Environments.Mainnet]: [
-      'https://rsk-live.sovryn.app/rpc',
-      'https://public-node.rsk.co',
-    ],
-    [Environments.Testnet]: [
-      'https://testnet.sovryn.app/rpc',
-      'https://public-node.testnet.rsk.co',
-    ],
+    [Environments.Mainnet]: ['https://rsk-live.sovryn.app/rpc'],
+    [Environments.Testnet]: ['https://testnet.sovryn.app/rpc'],
   },
   publicRpc: {
     [Environments.Mainnet]: 'https://mainnet.sovryn.app/rpc',
diff --git a/apps/frontend/src/contexts/CrocContext.tsx b/apps/frontend/src/contexts/CrocContext.tsx
index 3d70df85f..27e9e2664 100644
--- a/apps/frontend/src/contexts/CrocContext.tsx
+++ b/apps/frontend/src/contexts/CrocContext.tsx
@@ -7,11 +7,12 @@ import React, {
   useState,
 } from 'react';
 
-import { CrocEnv } from '@sovryn/sdex';
 import { getProvider } from '@sovryn/ethers-provider';
+import { CrocEnv } from '@sovryn/sdex';
 
 import { useAccount } from '../hooks/useAccount';
 import { useCurrentChain } from '../hooks/useChainStore';
+import { isBobChain } from '../utils/chain';
 
 type CrocContextValue = {
   croc?: CrocEnv;
@@ -31,7 +32,7 @@ export const CrocContextProvider: FC<PropsWithChildren> = ({ children }) => {
   const [croc, setCroc] = useState(defaultContextValue.croc);
 
   useEffect(() => {
-    if (!croc && account) {
+    if (!croc && account && isBobChain(chainId)) {
       setCroc(new CrocEnv(getProvider(chainId), signer));
     }
   }, [croc, signer, account, chainId]);
diff --git a/apps/frontend/src/router.tsx b/apps/frontend/src/router.tsx
index e9ab5e398..600913153 100644
--- a/apps/frontend/src/router.tsx
+++ b/apps/frontend/src/router.tsx
@@ -117,11 +117,7 @@ const routes = [
       },
       {
         path: '/earn/market-making',
-        element: (
-          <CrocContextProvider>
-            <MarketMakingPage />
-          </CrocContextProvider>
-        ),
+        element: <MarketMakingPage />,
       },
       {
         path: '/earn',