diff --git a/app/api/trading/positions/route.ts b/app/api/trading/positions/route.ts
index a3fb278..bcb260f 100644
--- a/app/api/trading/positions/route.ts
+++ b/app/api/trading/positions/route.ts
@@ -6,7 +6,7 @@
  */
 
 import { NextRequest, NextResponse } from 'next/server'
-import { getPositionManager } from '@/lib/trading/position-manager'
+import { getInitializedPositionManager } from '@/lib/trading/position-manager'
 
 export interface PositionsResponse {
   success: boolean
@@ -57,7 +57,7 @@ export async function GET(request: NextRequest): Promise<NextResponse<PositionsR
       )
     }
 
-    const positionManager = getPositionManager()
+    const positionManager = await getInitializedPositionManager()
     const status = positionManager.getStatus()
     const trades = positionManager.getActiveTrades()
 
diff --git a/app/api/trading/test-db/route.ts b/app/api/trading/test-db/route.ts
index 76716fe..0bfef63 100644
--- a/app/api/trading/test-db/route.ts
+++ b/app/api/trading/test-db/route.ts
@@ -9,7 +9,7 @@ import { NextRequest, NextResponse } from 'next/server'
 import { initializeDriftService } from '@/lib/drift/client'
 import { openPosition, placeExitOrders } from '@/lib/drift/orders'
 import { getMergedConfig } from '@/config/trading'
-import { getPositionManager, ActiveTrade } from '@/lib/trading/position-manager'
+import { getInitializedPositionManager, ActiveTrade } from '@/lib/trading/position-manager'
 import { createTrade } from '@/lib/database/trades'
 
 export interface TestTradeRequest {
@@ -184,7 +184,7 @@ export async function POST(request: NextRequest): Promise<NextResponse<TestTrade
     }
 
     // Add to position manager
-    const positionManager = getPositionManager()
+    const positionManager = await getInitializedPositionManager()
     await positionManager.addTrade(activeTrade)
     console.log('✅ Test trade added to position manager')
 
diff --git a/app/api/trading/test/route.ts b/app/api/trading/test/route.ts
index 434c21f..9bcde26 100644
--- a/app/api/trading/test/route.ts
+++ b/app/api/trading/test/route.ts
@@ -10,7 +10,7 @@ import { initializeDriftService } from '@/lib/drift/client'
 import { openPosition, placeExitOrders } from '@/lib/drift/orders'
 import { normalizeTradingViewSymbol } from '@/config/trading'
 import { getMergedConfig } from '@/config/trading'
-import { getPositionManager, ActiveTrade } from '@/lib/trading/position-manager'
+import { getInitializedPositionManager, ActiveTrade } from '@/lib/trading/position-manager'
 import { createTrade } from '@/lib/database/trades'
 
 export interface TestTradeRequest {
@@ -183,7 +183,7 @@ export async function POST(request: NextRequest): Promise<NextResponse<TestTrade
     }
 
     // Add to position manager for monitoring
-    const positionManager = getPositionManager()
+    const positionManager = await getInitializedPositionManager()
     await positionManager.addTrade(activeTrade)
     
     console.log('✅ Trade added to position manager for monitoring')