diff --git a/src/Managing.WebApp/src/components/organism/Backtest/backtestModal.tsx b/src/Managing.WebApp/src/components/organism/Backtest/backtestModal.tsx
index f8c2f75..526326a 100644
--- a/src/Managing.WebApp/src/components/organism/Backtest/backtestModal.tsx
+++ b/src/Managing.WebApp/src/components/organism/Backtest/backtestModal.tsx
@@ -141,16 +141,17 @@ const BacktestModal: React.FC<BacktestModalProps> = ({
   })
 
   const { data: accounts } = useQuery({
-    onSuccess: () => {
-      if (accounts) {
-        setSelectedAccount(accounts[0].name)
-      }
-      setSelectedTimeframe(Timeframe.FiveMinutes)
-    },
-    queryFn: () => accountClient.account_GetAccounts(),
+    queryFn: async () => { return await accountClient.account_GetAccounts() },
     queryKey: ['accounts'],
   })
 
+  useEffect(() => {
+    if (accounts) {
+      setSelectedAccount(accounts[0].name)
+      setSelectedTimeframe(Timeframe.FiveMinutes)
+    }
+  }, [accounts])
+
   const { data: tickers, refetch: refetchTickers } = useQuery({
     enabled: !!selectedAccount && !!selectedTimeframe,
     queryFn: () => {
@@ -163,29 +164,18 @@ const BacktestModal: React.FC<BacktestModalProps> = ({
 
   const { data: moneyManagements } = useQuery({
     enabled: !!selectedTimeframe,
-    onSuccess: (data) => {
-      if (data) {
-        setSelectedMoneyManagement(data[0].name)
-      }
-    },
     queryFn: async () => {
-      if (selectedTimeframe) {
-        const mm =
-          await moneyManagementClient.moneyManagement_GetMoneyManagements()
-        mm.push({
-          balanceAtRisk: 1,
-          leverage: 1,
-          name: 'Custom',
-          stopLoss: 1,
-          takeProfit: 1,
-          timeframe: selectedTimeframe,
-        })
-        return mm
-      }
+      return await moneyManagementClient.moneyManagement_GetMoneyManagements();
     },
     queryKey: ['moneyManagements', selectedTimeframe],
   })
 
+  useEffect(() => {
+    if (moneyManagements){
+      setSelectedMoneyManagement(moneyManagements[0].name)
+    }
+  }, [moneyManagements])
+
   useEffect(() => {
     if (selectedAccount && selectedTimeframe) {
       refetchTickers()
diff --git a/src/Managing.WebApp/src/global/type.tsx b/src/Managing.WebApp/src/global/type.tsx
index b51b4b3..9c8ca34 100644
--- a/src/Managing.WebApp/src/global/type.tsx
+++ b/src/Managing.WebApp/src/global/type.tsx
@@ -95,6 +95,7 @@ export type  IBacktestsFormInput = {
 export type  IBacktestCards = {
   list: Backtest[] | undefined
   isFetching?: boolean
+  setBacktests: React.Dispatch<React.SetStateAction<Backtest[]>>
 }
 
 export type  IFormInput = {