diff --git a/web/src/components/CompetitionPage.tsx b/web/src/components/CompetitionPage.tsx
index a72f6dfb..bc549e38 100644
--- a/web/src/components/CompetitionPage.tsx
+++ b/web/src/components/CompetitionPage.tsx
@@ -73,8 +73,8 @@ export function CompetitionPage() {
         <div className="text-right">
           <div className="text-xs mb-1" style={{ color: '#848E9C' }}>{t('leader', language)}</div>
           <div className="text-lg font-bold" style={{ color: '#F0B90B' }}>{leader?.trader_name}</div>
-          <div className="text-sm font-semibold" style={{ color: leader.total_pnl >= 0 ? '#0ECB81' : '#F6465D' }}>
-            {leader.total_pnl >= 0 ? '+' : ''}{leader.total_pnl_pct.toFixed(2)}%
+          <div className="text-sm font-semibold" style={{ color: (leader?.total_pnl ?? 0) >= 0 ? '#0ECB81' : '#F6465D' }}>
+            {(leader?.total_pnl ?? 0) >= 0 ? '+' : ''}{leader?.total_pnl_pct?.toFixed(2) || '0.00'}%
           </div>
         </div>
       </div>
@@ -139,7 +139,7 @@ export function CompetitionPage() {
                       <div className="text-right">
                         <div className="text-xs" style={{ color: '#848E9C' }}>{t('equity', language)}</div>
                         <div className="text-sm font-bold mono" style={{ color: '#EAECEF' }}>
-                          {trader.total_equity.toFixed(2)}
+                          {trader.total_equity?.toFixed(2) || '0.00'}
                         </div>
                       </div>
 
@@ -148,13 +148,13 @@ export function CompetitionPage() {
                         <div className="text-xs" style={{ color: '#848E9C' }}>{t('pnl', language)}</div>
                         <div
                           className="text-lg font-bold mono"
-                          style={{ color: trader.total_pnl >= 0 ? '#0ECB81' : '#F6465D' }}
+                          style={{ color: (trader.total_pnl ?? 0) >= 0 ? '#0ECB81' : '#F6465D' }}
                         >
-                          {trader.total_pnl >= 0 ? '+' : ''}
-                          {trader.total_pnl_pct.toFixed(2)}%
+                          {(trader.total_pnl ?? 0) >= 0 ? '+' : ''}
+                          {trader.total_pnl_pct?.toFixed(2) || '0.00'}%
                         </div>
                         <div className="text-xs mono" style={{ color: '#848E9C' }}>
-                          {trader.total_pnl >= 0 ? '+' : ''}{trader.total_pnl.toFixed(2)}
+                          {(trader.total_pnl ?? 0) >= 0 ? '+' : ''}{trader.total_pnl?.toFixed(2) || '0.00'}
                         </div>
                       </div>
 
@@ -226,8 +226,8 @@ export function CompetitionPage() {
                     >
                       {trader.trader_name}
                     </div>
-                    <div className="text-2xl font-bold mono mb-1" style={{ color: trader.total_pnl >= 0 ? '#0ECB81' : '#F6465D' }}>
-                      {trader.total_pnl >= 0 ? '+' : ''}{trader.total_pnl_pct.toFixed(2)}%
+                    <div className="text-2xl font-bold mono mb-1" style={{ color: (trader.total_pnl ?? 0) >= 0 ? '#0ECB81' : '#F6465D' }}>
+                      {(trader.total_pnl ?? 0) >= 0 ? '+' : ''}{trader.total_pnl_pct?.toFixed(2) || '0.00'}%
                     </div>
                     {isWinning && gap > 0 && (
                       <div className="text-xs font-semibold" style={{ color: '#0ECB81' }}>