diff --git a/src/Managing.Application/Bots/TradingBot.cs b/src/Managing.Application/Bots/TradingBot.cs
index facaf4c..81c98cf 100644
--- a/src/Managing.Application/Bots/TradingBot.cs
+++ b/src/Managing.Application/Bots/TradingBot.cs
@@ -286,7 +286,15 @@ public class TradingBot : Bot, ITradingBot
         var haveSignal = Signals.Any();
         if (haveSignal)
         {
-            PreloadSince = Signals.First().Date;
+            if (Signals.Count > 10)
+                PreloadSince = Signals.TakeLast(10).First().Date;
+            else
+                PreloadSince = Signals.First().Date;
+        }
+
+        if (Positions.Any() && Positions.First().Open.Date < PreloadSince)
+        {
+            PreloadSince = Positions.First().Open.Date;
         }
 
         var candles =
diff --git a/src/Managing.WebApp/src/components/organism/Trading/TradeChart/TradeChart.tsx b/src/Managing.WebApp/src/components/organism/Trading/TradeChart/TradeChart.tsx
index 1e308f6..f2f556b 100644
--- a/src/Managing.WebApp/src/components/organism/Trading/TradeChart/TradeChart.tsx
+++ b/src/Managing.WebApp/src/components/organism/Trading/TradeChart/TradeChart.tsx
@@ -345,8 +345,18 @@ const TradeChart = ({
 
         const markers: SeriesMarker<Time>[] = []
 
-        if (signals) {
-            const signalMarkers = signals.map((s) =>
+        if (signals && candles.length > 0) {
+            // Get the time range of candles
+            const firstCandleTime = moment(candles[0].date).unix()
+            const lastCandleTime = moment(candles[candles.length - 1].date).unix()
+            
+            // Filter signals that are within the candle range
+            const filteredSignals = signals.filter((s) => {
+                const signalTime = moment(s.date).unix()
+                return signalTime >= firstCandleTime && signalTime <= lastCandleTime
+            })
+            
+            const signalMarkers = filteredSignals.map((s) =>
                 buildMarker(
                     'circle',
                     s.direction == TradeDirection.Long ? theme.success : theme.error,