diff --git a/packages/cashier/src/containers/cashier/cashier.tsx b/packages/cashier/src/containers/cashier/cashier.tsx
index baad47f16897..7447affba0a9 100644
--- a/packages/cashier/src/containers/cashier/cashier.tsx
+++ b/packages/cashier/src/containers/cashier/cashier.tsx
@@ -108,10 +108,13 @@ const Cashier = observer(({ history, location, routes: routes_config }: TCashier
     }, [history, is_payment_agent_transfer_visible, is_payment_agent_transfer_visible_is_success]);
 
     React.useEffect(() => {
-        if (is_p2p_enabled_success && !is_p2p_enabled && history.location.pathname === routes.cashier_p2p) {
+        if (
+            (is_p2p_enabled_success && !is_p2p_enabled && history.location.pathname === routes.cashier_p2p) ||
+            (tab_index === 0 && !is_p2p_enabled)
+        ) {
             history.push(routes.cashier_deposit);
         }
-    }, [history, is_p2p_enabled, is_p2p_enabled_success]);
+    }, [history, is_p2p_enabled, is_p2p_enabled_success, tab_index]);
 
     const onClickClose = () => history.push(routes.traders_hub);
     const getMenuOptions = () => {