diff --git a/services/wallet/router/fees.go b/services/wallet/router/fees.go
index 615335043..920217d96 100644
--- a/services/wallet/router/fees.go
+++ b/services/wallet/router/fees.go
@@ -148,7 +148,6 @@ func (f *FeeManager) SuggestedFees(ctx context.Context, chainID uint64) (*Sugges
 			EIP1559Enabled: false,
 		}, nil
 	}
-
 	baseFee, err := f.getBaseFee(ctx, backend)
 	if err != nil {
 		return nil, err
@@ -190,19 +189,17 @@ func (f *FeeManager) getBaseFee(ctx context.Context, client chain.ClientInterfac
 	}
 
 	chainID := client.NetworkID()
-
 	config := params.MainnetChainConfig
 	switch chainID {
-	case common.EthereumSepolia:
-	case common.OptimismSepolia:
-	case common.ArbitrumSepolia:
+	case common.EthereumSepolia,
+		common.OptimismSepolia,
+		common.ArbitrumSepolia:
 		config = params.SepoliaChainConfig
-	case common.EthereumGoerli:
-	case common.OptimismGoerli:
-	case common.ArbitrumGoerli:
+	case common.EthereumGoerli,
+		common.OptimismGoerli,
+		common.ArbitrumGoerli:
 		config = params.GoerliChainConfig
 	}
-
 	baseFee := misc.CalcBaseFee(config, header)
 	return baseFee, nil
 }
diff --git a/services/wallet/router/router_v2.go b/services/wallet/router/router_v2.go
index bce849f89..181ffb1b4 100644
--- a/services/wallet/router/router_v2.go
+++ b/services/wallet/router/router_v2.go
@@ -260,7 +260,6 @@ func findBestV2(routes [][]*PathV2, tokenPrice float64, nativeChainTokenPrice fl
 			// ecaluate the cost of the path
 			pathCost := big.NewFloat(0)
 			nativeTokenPrice := new(big.Float).SetFloat64(nativeChainTokenPrice)
-
 			if path.TxBaseFee != nil && path.TxPriorityFee != nil {
 				feePerGas := new(big.Int).Add(path.TxBaseFee.ToInt(), path.TxPriorityFee.ToInt())
 				txFeeInWei := new(big.Int).Mul(feePerGas, big.NewInt(int64(path.TxGasAmount)))
@@ -269,7 +268,6 @@ func findBestV2(routes [][]*PathV2, tokenPrice float64, nativeChainTokenPrice fl
 				path.requiredNativeBalance.Add(path.requiredNativeBalance, txFeeInWei)
 				pathCost = new(big.Float).Mul(txFeeInEth, nativeTokenPrice)
 			}
-
 			if path.TxBonderFees != nil && path.TxBonderFees.ToInt().Cmp(pathprocessor.ZeroBigIntValue) > 0 {
 				if path.FromToken.IsNative() {
 					path.requiredNativeBalance.Add(path.requiredNativeBalance, path.TxBonderFees.ToInt())
@@ -281,7 +279,6 @@ func findBestV2(routes [][]*PathV2, tokenPrice float64, nativeChainTokenPrice fl
 					new(big.Float).SetFloat64(tokenPrice)))
 
 			}
-
 			if path.TxL1Fee != nil && path.TxL1Fee.ToInt().Cmp(pathprocessor.ZeroBigIntValue) > 0 {
 				l1FeeInWei := path.TxL1Fee.ToInt()
 				l1FeeInEth := gweiToEth(weiToGwei(l1FeeInWei))
@@ -289,7 +286,6 @@ func findBestV2(routes [][]*PathV2, tokenPrice float64, nativeChainTokenPrice fl
 				path.requiredNativeBalance.Add(path.requiredNativeBalance, l1FeeInWei)
 				pathCost.Add(pathCost, new(big.Float).Mul(l1FeeInEth, nativeTokenPrice))
 			}
-
 			if path.TxTokenFees != nil && path.TxTokenFees.ToInt().Cmp(pathprocessor.ZeroBigIntValue) > 0 && path.FromToken != nil {
 				if path.FromToken.IsNative() {
 					path.requiredNativeBalance.Add(path.requiredNativeBalance, path.TxTokenFees.ToInt())
@@ -300,7 +296,6 @@ func findBestV2(routes [][]*PathV2, tokenPrice float64, nativeChainTokenPrice fl
 					new(big.Float).Quo(new(big.Float).SetInt(path.TxTokenFees.ToInt()), tokenDenominator),
 					new(big.Float).SetFloat64(tokenPrice)))
 			}
-
 			if path.ApprovalRequired {
 				if path.ApprovalBaseFee != nil && path.ApprovalPriorityFee != nil {
 					feePerGas := new(big.Int).Add(path.ApprovalBaseFee.ToInt(), path.ApprovalPriorityFee.ToInt())
@@ -657,15 +652,16 @@ func (r *Router) resolveCandidates(ctx context.Context, input *RouteInputParams)
 						continue
 					}
 
-					var l1FeeWei uint64
-					if input.SendType.needL1Fee() {
-						txInputData, err := pProcessor.PackTxInputData(processorInputParams)
-						if err != nil {
-							continue
-						}
+					// TODO: keep l1 fees at 0 until we have the correct algorithm, as we do base fee x 2 that should cover the l1 fees
+					var l1FeeWei uint64 = 0
+					// if input.SendType.needL1Fee() {
+					// 	txInputData, err := pProcessor.PackTxInputData(processorInputParams)
+					// 	if err != nil {
+					// 		continue
+					// 	}
 
-						l1FeeWei, _ = r.feesManager.GetL1Fee(ctx, network.ChainID, txInputData)
-					}
+					// 	l1FeeWei, _ = r.feesManager.GetL1Fee(ctx, network.ChainID, txInputData)
+					// }
 
 					amountOut, err := pProcessor.CalculateAmountOut(processorInputParams)
 					if err != nil {
diff --git a/services/wallet/router/router_v2_test.go b/services/wallet/router/router_v2_test.go
index 95c12df75..e32f2343e 100644
--- a/services/wallet/router/router_v2_test.go
+++ b/services/wallet/router/router_v2_test.go
@@ -2455,6 +2455,8 @@ func TestNoBalanceForTheBestRouteRouterV2(t *testing.T) {
 					suggestedFees: testSuggestedFees,
 					balanceMap: map[string]*big.Int{
 						makeTestBalanceKey(walletCommon.ArbitrumMainnet, pathprocessor.UsdcSymbol): big.NewInt(testAmount100USDC + testAmount100USDC),
+						makeTestBalanceKey(walletCommon.EthereumMainnet, pathprocessor.UsdcSymbol): big.NewInt(testAmount100USDC + testAmount100USDC),
+						makeTestBalanceKey(walletCommon.OptimismMainnet, pathprocessor.UsdcSymbol): big.NewInt(testAmount100USDC + testAmount100USDC),
 					},
 					estimationMap:         testEstimationMap,
 					bonderFeeMap:          testBbonderFeeMap,