diff --git a/frontend/src/components/Layout.tsx b/frontend/src/components/Layout.tsx
index 03c3c6b..7615d8e 100644
--- a/frontend/src/components/Layout.tsx
+++ b/frontend/src/components/Layout.tsx
@@ -39,7 +39,7 @@ export default function Layout({ children }: { children: ReactNode }) {
             <NavLink key={to} to={to} className={({ isActive }) => isActive ? 'active' : ''}>
               <Icon {...ICON} />
               {label}
-              {to === '/market' && alertCount ? (
+              {to === '/market' && alertCount != null && alertCount > 0 ? (
                 <span style={{
                   marginLeft: 'auto', background: 'var(--danger)', color: '#fff',
                   borderRadius: 10, fontSize: 10, fontWeight: 700,
@@ -49,7 +49,7 @@ export default function Layout({ children }: { children: ReactNode }) {
             </NavLink>
           ))}
         </nav>
-        <div className="sidebar-user">{user.name || user.email}</div>
+        <div className="sidebar-user">{user.name ?? user.email}</div>
       </aside>
 
       <header className="top-bar">
diff --git a/frontend/src/pages/RateAnalysis.tsx b/frontend/src/pages/RateAnalysis.tsx
index 1ebf4bf..5c7b874 100644
--- a/frontend/src/pages/RateAnalysis.tsx
+++ b/frontend/src/pages/RateAnalysis.tsx
@@ -354,7 +354,7 @@ function buildTimelineTraces(entries: TimelineEntry[]) {
     mode: 'lines+markers' as const,
     name: room,
     x: pts.map(p => p.scraped_at),
-    y: pts.map(p => p.price_incl),
+    y: pts.map(p => p.price_incl ?? null),
     line: { color: colors[i % colors.length], width: 2 },
     marker: { size: 5, color: colors[i % colors.length] },
     hovertemplate: `${room}: £%{y:.2f}<extra></extra>`,