diff --git a/app/automation-v2/page.js b/app/automation-v2/page.js
index 63001c6..110093c 100644
--- a/app/automation-v2/page.js
+++ b/app/automation-v2/page.js
@@ -364,7 +364,7 @@ export default function AutomationPageV2() {
                 <div className="p-2 bg-gray-800/30 rounded-lg mb-3">
                   <div className="text-xs text-gray-400">
                     Selected: <span className="text-cyan-400">
-                      {config.selectedTimeframes.map(tf => timeframes.find(t => t.value === tf)?.label).filter(Boolean).join(', ')}
+                      {(status.selectedTimeframes || [status.timeframe]).map(tf => timeframes.find(t => t.value === tf)?.label || tf).filter(Boolean).join(', ')}
                     </span>
                   </div>
                   <div className="text-xs text-gray-500 mt-1">
@@ -499,7 +499,7 @@ export default function AutomationPageV2() {
                 <div className="flex justify-between">
                   <span className="text-gray-300">Timeframes:</span>
                   <span className="text-cyan-400 font-semibold text-xs">
-                    {config.selectedTimeframes.map(tf => timeframes.find(t => t.value === tf)?.label).filter(Boolean).join(', ')}
+                    {(status.selectedTimeframes || [status.timeframe]).map(tf => timeframes.find(t => t.value === tf)?.label || tf).filter(Boolean).join(', ')}
                   </span>
                 </div>
               </div>
diff --git a/lib/automation-service-simple.ts b/lib/automation-service-simple.ts
index 7f17214..cde35e9 100644
--- a/lib/automation-service-simple.ts
+++ b/lib/automation-service-simple.ts
@@ -103,6 +103,7 @@ export class AutomationService {
             maxLeverage: config.maxLeverage,
             // stopLossPercent and takeProfitPercent removed - AI calculates these automatically
             maxDailyTrades: config.maxDailyTrades,
+            selectedTimeframes: config.selectedTimeframes,
             riskPercentage: config.riskPercentage
           },
           startBalance: config.tradingAmount,
@@ -169,8 +170,8 @@ export class AutomationService {
 
   private getIntervalFromTimeframe(timeframe: string): number {
     // Check if this is a scalping strategy (multiple short timeframes)
-    if (this.config?.selectedTimeframes) {
-      const timeframes = this.config.selectedTimeframes
+    if (this.config?.selectedTimeframes || this.config?.settings?.selectedTimeframes) {
+      const timeframes = this.config.selectedTimeframes || this.config.settings?.selectedTimeframes
       const isScalping = timeframes.includes('5') || timeframes.includes('3') || (timeframes.length > 1 && timeframes.every(tf => ['1', '3', '5', '15', '30'].includes(tf)))
       if (isScalping) {
         console.log('🎯 Scalping strategy detected - using frequent analysis (2-3 minutes)')
@@ -1366,6 +1367,7 @@ ${validResults.map(r => `• ${r.timeframe}: ${r.analysis?.recommendation} (${r.
         mode: session.mode as 'SIMULATION' | 'LIVE',
         symbol: session.symbol,
         timeframe: session.timeframe,
+        selectedTimeframes: session.settings?.selectedTimeframes,
         totalTrades: session.totalTrades,
         successfulTrades: session.successfulTrades,
         winRate: session.winRate,