diff --git a/frontend/src/pages/CompanyDetail.tsx b/frontend/src/pages/CompanyDetail.tsx
index a21a945..5c043dd 100644
--- a/frontend/src/pages/CompanyDetail.tsx
+++ b/frontend/src/pages/CompanyDetail.tsx
@@ -44,7 +44,8 @@ export function CompanyDetailPage() {
   const { data: signals } = useCompetitiveSignals(company?.ticker);
   const { data: decisions } = useCorporateDecisions(company?.ticker);
   const { data: trends } = useTrends({ ticker: company?.ticker, limit: 200 });
-  const { data: trendHistory } = useTrendHistory({ ticker: company?.ticker, limit: 500 });
+  const [selectedWindow, setSelectedWindow] = useState('7d');
+  const { data: trendHistory } = useTrendHistory({ ticker: company?.ticker, window: selectedWindow, limit: 500 });
   const { data: marketPrices } = useMarketPrices(company?.ticker, 200);
   const { data: positions } = usePositions(company?.ticker);
   const [tab, setTab] = useState<'trends' | 'sources' | 'aliases' | 'macro' | 'competitors' | 'patterns' | 'signals' | 'decisions'>('trends');
@@ -87,7 +88,7 @@ export function CompanyDetailPage() {
       {tab === 'trends' && (
         <div className="space-y-4">
           <PositionCard positions={positions ?? []} ticker={company.ticker} />
-          <TrendHistoryChart trends={trendHistory ?? []} latestTrends={trends ?? []} ticker={company.ticker} marketPrices={marketPrices ?? []} />
+          <TrendHistoryChart trends={trendHistory ?? []} latestTrends={trends ?? []} ticker={company.ticker} marketPrices={marketPrices ?? []} selectedWindow={selectedWindow} onWindowChange={setSelectedWindow} />
         </div>
       )}
 
@@ -662,8 +663,7 @@ function PositionCard({ positions, ticker }: { positions: import('../api/hooks')
   );
 }
 
-function TrendHistoryChart({ trends, latestTrends, ticker, marketPrices }: { trends: TrendSummary[]; latestTrends: TrendSummary[]; ticker: string; marketPrices: MarketPrice[] }) {
-  const [selectedWindow, setSelectedWindow] = useState('7d');
+function TrendHistoryChart({ trends, latestTrends, ticker, marketPrices, selectedWindow, onWindowChange }: { trends: TrendSummary[]; latestTrends: TrendSummary[]; ticker: string; marketPrices: MarketPrice[]; selectedWindow: string; onWindowChange: (w: string) => void }) {
 
   // Determine the time range for the selected window to filter data
   const windowHours: Record<string, number> = {
@@ -742,7 +742,7 @@ function TrendHistoryChart({ trends, latestTrends, ticker, marketPrices }: { tre
         {(availableWindows.length > 0 ? availableWindows : WINDOW_ORDER).map((w) => (
           <button
             key={w}
-            onClick={() => setSelectedWindow(w)}
+            onClick={() => onWindowChange(w)}
             className={`rounded-md px-3 py-1 text-xs font-medium transition-colors ${
               selectedWindow === w
                 ? 'bg-brand-600 text-white'
diff --git a/services/scheduler/app.py b/services/scheduler/app.py
index 919f0b6..df48b86 100644
--- a/services/scheduler/app.py
+++ b/services/scheduler/app.py
@@ -501,22 +501,11 @@ async def schedule_cycle(pool: asyncpg.Pool, rds: aioredis.Redis) -> int:
 async def enqueue_periodic_aggregation(pool: asyncpg.Pool, rds: aioredis.Redis) -> int:
     """Enqueue aggregation jobs for all active tickers.
 
-    Runs periodically during market hours to ensure trend data stays fresh
-    even when no new documents are being ingested. This gives the intraday
-    and 1d windows continuous updates based on existing signals and market
-    price changes.
+    Runs periodically to ensure trend data stays fresh even when no new
+    documents are being ingested. During market hours this runs every ~15
+    minutes; outside market hours it runs every ~60 minutes (for backtesting
+    data continuity).
     """
-    # Only run during US market hours (Mon-Fri, 6:30 AM - 1:30 PM PT / 13:30-20:30 UTC)
-    from datetime import datetime, timezone
-    now = datetime.now(timezone.utc)
-    weekday = now.weekday()  # 0=Mon, 6=Sun
-    hour_utc = now.hour + now.minute / 60.0
-
-    if weekday >= 5:  # Weekend
-        return 0
-    if hour_utc < 13.5 or hour_utc > 20.5:  # Outside market hours (with 30min buffer)
-        return 0
-
     # Fetch all active tickers
     rows = await pool.fetch(
         "SELECT ticker FROM companies WHERE active = TRUE ORDER BY ticker"