diff --git a/app/history/components/HistoryTable.tsx b/app/history/components/HistoryTable.tsx
index 1453477c..d9e5cf56 100644
--- a/app/history/components/HistoryTable.tsx
+++ b/app/history/components/HistoryTable.tsx
@@ -85,7 +85,7 @@ export function HistoryTable({ account, positions, rebalancerInfo }: HistoryTabl
 
   useEffect(() => {
     const loadTransactions = async () => {
-      if (!account || !fetchTransactions) return;
+      if (!account || !fetchTransactions || filteredMarketIds.length === 0) return;
 
       const result = await fetchTransactions({
         userAddress: [account],
@@ -102,7 +102,7 @@ export function HistoryTable({ account, positions, rebalancerInfo }: HistoryTabl
     };
 
     void loadTransactions();
-  }, [markets, account, currentPage, fetchTransactions, filteredMarketIds]);
+  }, [account, currentPage, fetchTransactions, filteredMarketIds]);
 
   useEffect(() => {
     const handleClickOutside = (event: MouseEvent) => {
diff --git a/app/positions/components/RebalanceModal.tsx b/app/positions/components/RebalanceModal.tsx
index 2bbc75de..9fde41ea 100644
--- a/app/positions/components/RebalanceModal.tsx
+++ b/app/positions/components/RebalanceModal.tsx
@@ -240,7 +240,7 @@ export function RebalanceModal({
   ]);
 
   const { chainId } = useAccount();
-  const { switchChain } = useSwitchChain();
+  const { switchChainAsync } = useSwitchChain();
 
   const needSwitchChain = useMemo(
     () => chainId !== groupedPosition.chainId,
@@ -250,17 +250,13 @@ export function RebalanceModal({
   const handleExecuteRebalance = useCallback(async () => {
     if (needSwitchChain) {
       try {
-        switchChain({ chainId: groupedPosition.chainId });
-        // The actual execution will happen after network switch through useEffect
-        return;
+        await switchChainAsync({ chainId: groupedPosition.chainId });
       } catch (error) {
-        console.error('Failed to switch network:', error);
         toast.error('Something went wrong', 'Failed to switch network. Please try again');
         return;
       }
     }
 
-    console.log('executeRebalance');
     setShowProcessModal(true);
     try {
       await executeRebalance();
@@ -269,7 +265,7 @@ export function RebalanceModal({
     } finally {
       setShowProcessModal(false);
     }
-  }, [executeRebalance, needSwitchChain, switchChain, groupedPosition.chainId, toast]);
+  }, [executeRebalance, needSwitchChain, switchChainAsync, groupedPosition.chainId, toast]);
 
   const handleManualRefresh = () => {
     refetch(() => {
diff --git a/src/contexts/MarketsContext.tsx b/src/contexts/MarketsContext.tsx
index e5e46bcb..fcc2ba30 100644
--- a/src/contexts/MarketsContext.tsx
+++ b/src/contexts/MarketsContext.tsx
@@ -51,8 +51,6 @@ export function MarketsProvider({ children }: MarketsProviderProps) {
     refetch: refetchLiquidations,
   } = useLiquidations();
 
-  console.log('markets', markets);
-
   const fetchMarkets = useCallback(
     async (isRefetch = false) => {
       try {
diff --git a/src/hooks/useUserTransactions.ts b/src/hooks/useUserTransactions.ts
index e38003c9..58e7215e 100644
--- a/src/hooks/useUserTransactions.ts
+++ b/src/hooks/useUserTransactions.ts
@@ -67,7 +67,8 @@ const useUserTransactions = () => {
           throw new Error(result.errors[0].message);
         }
 
-        return result.data?.transactions as TransactionResponse;
+        const transactions = result.data?.transactions as TransactionResponse;
+        return transactions;
       } catch (err) {
         console.error('Error fetching transactions:', err);
         setError(err);