diff --git a/app/api/trading/execute/route.ts b/app/api/trading/execute/route.ts
index 0f5b764..3cde9dc 100644
--- a/app/api/trading/execute/route.ts
+++ b/app/api/trading/execute/route.ts
@@ -1034,12 +1034,13 @@ export async function POST(request: NextRequest): Promise<NextResponse<ExecuteTr
     console.log('🔍 DEBUG: Exit orders section complete, about to calculate quality score...')
 
     // Save trade to database FIRST (CRITICAL: Must succeed before Position Manager)
+    let savedTrade
     try {
       // Quality score already calculated earlier for adaptive leverage
       console.log('🔍 DEBUG: Using quality score from earlier calculation:', qualityResult.score)
       console.log('🔍 DEBUG: About to call createTrade()...')
       
-      await createTrade({
+      savedTrade = await createTrade({
         positionId: openResult.transactionSignature!,
         symbol: driftSymbol,
         direction: body.direction,
@@ -1074,6 +1075,7 @@ export async function POST(request: NextRequest): Promise<NextResponse<ExecuteTr
       })
       
       console.log('🔍 DEBUG: createTrade() completed successfully')
+      console.log(`💾 Execute: Trade saved to database (ID: ${savedTrade.id})`)
       console.log(`💾 Trade saved with quality score: ${qualityResult.score}/100`)
       console.log(`📊 Quality reasons: ${qualityResult.reasons.join(', ')}`)
       
@@ -1110,6 +1112,10 @@ export async function POST(request: NextRequest): Promise<NextResponse<ExecuteTr
         error: dbError instanceof Error ? dbError.message : 'Database save failed'
       })
       
+      // Fallback: Create placeholder with synthetic ID (prevents crash)
+      savedTrade = { id: `trade-${Date.now()}` } as any
+      console.log('⚠️ Using synthetic ID as fallback after DB error')
+      
       // CRITICAL: If database save fails, we MUST NOT add to Position Manager
       // Return error to user so they know to close manually
       return NextResponse.json(
@@ -1122,6 +1128,10 @@ export async function POST(request: NextRequest): Promise<NextResponse<ExecuteTr
       )
     }
     
+    // BUG #88 FIX: Use real database ID for Position Manager tracking
+    activeTrade.id = savedTrade.id
+    console.log(`📊 ADDTRADE: Using real database ID: ${savedTrade.id}`)
+    
     // Add to position manager for monitoring ONLY AFTER database save succeeds
     await positionManager.addTrade(activeTrade)