diff --git a/DEVELOPMENT_LOG.md b/DEVELOPMENT_LOG.md
index b1f8a8f..feea75b 100644
--- a/DEVELOPMENT_LOG.md
+++ b/DEVELOPMENT_LOG.md
@@ -6,6 +6,35 @@
 
 ---
 
+### v0.22.1 — N+1 Query Optimization
+**Status:** ✅ COMPLETED  
+**Date:** 2026-05-10  
+**Priority:** MEDIUM
+
+| Agent | Status | Time | Notes |
+|-------|--------|------|-------|
+| Neo | ✅ COMPLETED | 6m7s | Batch queries for tracker + analytics |
+| Ripley | ✅ COMPLETED | — | Reviewed changes, version bump 0.22.0 → 0.22.1 |
+| Bishop | ✅ COMPLETED | 2m13s | 6/6 PASS |
+| Hudson | ✅ COMPLETED | 18s | 5/5 PASS |
+
+**Files modified:** `routes/tracker.js`, `routes/analytics.js`
+
+**Work Completed:**
+- [x] Tracker: batch monthly_bill_state, payments, prev month payments, upcoming payments
+- [x] Analytics: added empty billIds guards
+- [x] All batch queries guarded by `billIds.length > 0` for empty list safety
+- [x] IN clause built with parameterized placeholders (no SQL injection)
+
+**Security Audit (Hudson):**
+1. SQL injection: ✅ PASS — parameterized placeholders only
+2. Empty IN clause: ✅ PASS — all guarded
+3. User scoping: ✅ PASS — bills scoped by req.user.id
+4. No data leakage: ✅ PASS — bills filtered before extracting IDs
+5. Type safety: ✅ PASS — bill.id from SQLite auto-increment
+
+---
+
 ### v0.22.0 — React Query Migration
 **Status:** ✅ COMPLETED  
 **Date:** 2026-05-10  
diff --git a/FUTURE.md b/FUTURE.md
index ac23d70..88abc73 100644
--- a/FUTURE.md
+++ b/FUTURE.md
@@ -3,7 +3,7 @@
 **This document tracks potential future enhancements for Bill Tracker.**
 
 **Last Updated:** 2026-05-10  
-**Current Version:** v0.22.0
+**Current Version:** v0.22.1
 
 ## How to Use This Document
 
@@ -66,30 +66,6 @@ Many routes contain business logic that should be extracted to service layers.
   ```
 - Route handlers should call services, not contain business logic
 
-### Performance: N+1 Query Patterns in Tracker and Analytics
-**Priority:** MEDIUM  
-**Added:** 2026-05-08 by Neo
-
-**Description:**
-Looping over bills and querying payments/state individually causes N+1 queries.
-
-**Rationale:**
-- `tracker.js` line 27-37: iterates over `bills`, runs `mbsStmt.get()` per bill
-- `analytics.js` uses `bills.map()` and builds maps with per-bill lookups
-- With 50 bills, this creates 100+ extra queries per request
-
-**Implementation Notes:**
-- Files to modify: `/home/kaspa/.openclaw/Projects/bill-tracker/routes/tracker.js`, `/analytics.js`
-- Estimated effort: 3 hours
-- Use batch queries instead:
-  ```js
-  // Fetch all monthly states for bills in one query
-  const states = db.prepare(`
-    SELECT * FROM monthly_bill_state
-    WHERE bill_id IN (${billIds.join(',')}) AND year=? AND month=?
-  `).all(billIds, year, month);
-  ```
-
 ### Security: Session Token Not Rotated on Auth Events
 **Priority:** MEDIUM  
 **Added:** 2026-05-08 by Neo
diff --git a/HISTORY.md b/HISTORY.md
index 9e0e15c..8fae12c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,11 @@
 # Bill Tracker — Changelog
 
+## v0.22.1
+
+### Changed
+- **N+1 Query Optimization** — Batch queries replace per-bill loops in tracker and analytics (monthly states, payments, previous month, upcoming)
+- Empty bill list edge case handled with `billIds.length > 0` guards
+
 ## v0.22.0
 
 ### Added
diff --git a/client/lib/version.js b/client/lib/version.js
index fcfc02f..4463a71 100644
--- a/client/lib/version.js
+++ b/client/lib/version.js
@@ -1,11 +1,10 @@
-export const APP_VERSION = '0.22.0';
+export const APP_VERSION = '0.22.1';
 export const APP_NAME    = 'BillTracker';
 
 export const RELEASE_NOTES = {
-  version: '0.22.0',
+  version: '0.22.1',
   date: '2026-05-10',
   highlights: [
-    { icon: '🔄', title: 'React Query Migration', desc: 'Tracker page now uses TanStack Query for data fetching with caching and auto-refetch.' },
-    { icon: '⚡', title: 'Query DevTools', desc: 'React Query DevTools available in development for inspecting query state.' },
+    { icon: '⚡', title: 'N+1 Query Optimization', desc: 'Batch queries for tracker and analytics — eliminated per-bill database loops for faster page loads.' },
   ],
 };
\ No newline at end of file
diff --git a/package.json b/package.json
index ace09bf..76eb189 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bill-tracker",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "description": "Monthly bill tracking system",
   "main": "server.js",
   "scripts": {
diff --git a/routes/analytics.js b/routes/analytics.js
index 18c3e6f..633e28b 100644
--- a/routes/analytics.js
+++ b/routes/analytics.js
@@ -143,32 +143,40 @@ router.get('/summary', (req, res) => {
   const billIds = bills.map(b => b.id);
   const placeholders = billIds.map(() => '?').join(',');
 
-  const paymentRows = db.prepare(`
-    SELECT p.bill_id,
-           substr(p.paid_date, 1, 7) AS month_key,
-           SUM(p.amount) AS total
-    FROM payments p
-    JOIN bills b ON b.id = p.bill_id
-    WHERE b.user_id = ?
-      AND p.bill_id IN (${placeholders})
-      AND p.paid_date BETWEEN ? AND ?
-      AND p.deleted_at IS NULL
-    GROUP BY p.bill_id, substr(p.paid_date, 1, 7)
-  `).all(userId, ...billIds, startDate, endDate);
+  // Batch fetch all payments for the date range
+  let paymentRows = [];
+  if (billIds.length > 0) {
+    paymentRows = db.prepare(`
+      SELECT p.bill_id,
+             substr(p.paid_date, 1, 7) AS month_key,
+             SUM(p.amount) AS total
+      FROM payments p
+      JOIN bills b ON b.id = p.bill_id
+      WHERE b.user_id = ?
+        AND p.bill_id IN (${placeholders})
+        AND p.paid_date BETWEEN ? AND ?
+        AND p.deleted_at IS NULL
+      GROUP BY p.bill_id, substr(p.paid_date, 1, 7)
+    `).all(userId, ...billIds, startDate, endDate);
+  }
 
-  const stateRows = db.prepare(`
-    SELECT m.bill_id, m.year, m.month, m.actual_amount, m.is_skipped
-    FROM monthly_bill_state m
-    JOIN bills b ON b.id = m.bill_id
-    WHERE b.user_id = ?
-      AND m.bill_id IN (${placeholders})
-      AND (m.year * 100 + m.month) BETWEEN ? AND ?
-  `).all(
-    userId,
-    ...billIds,
-    rangeMonths[0].year * 100 + rangeMonths[0].month,
-    rangeMonths[rangeMonths.length - 1].year * 100 + rangeMonths[rangeMonths.length - 1].month,
-  );
+  // Batch fetch all monthly bill states for the date range
+  let stateRows = [];
+  if (billIds.length > 0) {
+    stateRows = db.prepare(`
+      SELECT m.bill_id, m.year, m.month, m.actual_amount, m.is_skipped
+      FROM monthly_bill_state m
+      JOIN bills b ON b.id = m.bill_id
+      WHERE b.user_id = ?
+        AND m.bill_id IN (${placeholders})
+        AND (m.year * 100 + m.month) BETWEEN ? AND ?
+    `).all(
+      userId,
+      ...billIds,
+      rangeMonths[0].year * 100 + rangeMonths[0].month,
+      rangeMonths[rangeMonths.length - 1].year * 100 + rangeMonths[rangeMonths.length - 1].month,
+    );
+  }
 
   const paymentByBillMonth = new Map(paymentRows.map(row => [`${row.bill_id}:${row.month_key}`, Number(row.total) || 0]));
   const stateByBillMonth = new Map(stateRows.map(row => [`${row.bill_id}:${monthKey(row.year, row.month)}`, row]));
diff --git a/routes/tracker.js b/routes/tracker.js
index 9febed6..d4fe249 100644
--- a/routes/tracker.js
+++ b/routes/tracker.js
@@ -39,47 +39,71 @@ router.get('/', (req, res) => {
     ORDER BY b.due_day ASC, b.name ASC
   `).all(req.user.id);
 
-  const mbsStmt = db.prepare(
-    'SELECT actual_amount, notes, is_skipped FROM monthly_bill_state WHERE bill_id=? AND year=? AND month=?'
-  );
+  // Batch fetch all monthly bill states for current month
+  const billIds = bills.map(bill => bill.id);
+  const placeholders = billIds.map(() => '?').join(',');
+  
+  let monthlyStates = {};
+  if (billIds.length > 0) {
+    const monthlyStateQuery = `
+      SELECT bill_id, actual_amount, notes, is_skipped 
+      FROM monthly_bill_state 
+      WHERE bill_id IN (${placeholders}) AND year = ? AND month = ?
+    `;
+    const monthlyStateRows = db.prepare(monthlyStateQuery).all(...billIds, year, month);
+    monthlyStates = Object.fromEntries(monthlyStateRows.map(row => [row.bill_id, row]));
+  }
 
-  // Prepare statement for previous month payments
-  const prevMonthPaymentsStmt = db.prepare(`
-    SELECT SUM(amount) as total_paid
-    FROM payments
-    WHERE bill_id = ? AND paid_date BETWEEN ? AND ?
-      AND deleted_at IS NULL
-  `);
-
-  // Prepare statement for 3-month trend calculations
-  const threeMonthPaymentsStmt = db.prepare(`
-    SELECT SUM(amount) as total_paid, strftime('%Y-%m', paid_date) as month_key
-    FROM payments
-    WHERE bill_id = ? AND paid_date BETWEEN ? AND ?
-      AND deleted_at IS NULL
-    GROUP BY strftime('%Y-%m', paid_date)
-  `);
-
-  const rows = bills.map(bill => {
-    // Only count non-deleted payments for status/totals
-    const payments = db.prepare(`
-      SELECT * FROM payments
-      WHERE bill_id = ? AND paid_date BETWEEN ? AND ?
+  // Batch fetch all payments for current month
+  let allPayments = {};
+  if (billIds.length > 0) {
+    const paymentsQuery = `
+      SELECT bill_id, id, amount, paid_date, method, notes, created_at, updated_at
+      FROM payments
+      WHERE bill_id IN (${placeholders}) AND paid_date BETWEEN ? AND ?
         AND deleted_at IS NULL
       ORDER BY paid_date DESC
-    `).all(bill.id, start, end);
+    `;
+    const paymentRows = db.prepare(paymentsQuery).all(...billIds, start, end);
+    
+    // Group payments by bill_id
+    allPayments = {};
+    paymentRows.forEach(row => {
+      if (!allPayments[row.bill_id]) {
+        allPayments[row.bill_id] = [];
+      }
+      allPayments[row.bill_id].push(row);
+    });
+  }
+
+  // Batch fetch all previous month payments
+  let prevMonthPayments = {};
+  if (billIds.length > 0) {
+    const prevPaymentsQuery = `
+      SELECT bill_id, SUM(amount) as total_paid
+      FROM payments
+      WHERE bill_id IN (${placeholders}) AND paid_date BETWEEN ? AND ?
+        AND deleted_at IS NULL
+      GROUP BY bill_id
+    `;
+    const prevPaymentRows = db.prepare(prevPaymentsQuery).all(...billIds, prevMonthRange.start, prevMonthRange.end);
+    prevMonthPayments = Object.fromEntries(prevPaymentRows.map(row => [row.bill_id, row.total_paid]));
+  }
+
+  const rows = bills.map(bill => {
+    // Get payments for this bill
+    const payments = allPayments[bill.id] || [];
 
     const row = buildTrackerRow(bill, payments, year, month, todayStr);
 
     // Overlay monthly state overrides
-    const mbs = mbsStmt.get(bill.id, year, month);
+    const mbs = monthlyStates[bill.id];
     row.actual_amount  = mbs?.actual_amount  ?? null;
     row.monthly_notes  = mbs?.notes          ?? null;
     row.is_skipped     = !!(mbs?.is_skipped);
 
     // Get previous month paid amount
-    const prevMonthPayments = prevMonthPaymentsStmt.get(bill.id, prevMonthRange.start, prevMonthRange.end);
-    row.previous_month_paid = prevMonthPayments?.total_paid || 0;
+    row.previous_month_paid = prevMonthPayments[bill.id] || 0;
 
     return row;
   });
@@ -214,18 +238,40 @@ router.get('/upcoming', (req, res) => {
   cutoff.setDate(cutoff.getDate() + days);
   const cutoffStr = cutoff.toISOString().slice(0, 10);
 
+  // Get all bill IDs for batch processing
+  const billIds = bills.map(bill => bill.id);
+  
+  // Batch fetch all payments for all bills in the date range
+  let allPayments = {};
+  if (billIds.length > 0) {
+    const placeholders = billIds.map(() => '?').join(',');
+    const paymentsQuery = `
+      SELECT bill_id, id, amount, paid_date, method, notes, created_at, updated_at
+      FROM payments
+      WHERE bill_id IN (${placeholders}) AND paid_date BETWEEN ? AND ?
+        AND deleted_at IS NULL
+      ORDER BY paid_date DESC
+    `;
+    const paymentRows = db.prepare(paymentsQuery).all(...billIds, start, end);
+    
+    // Group payments by bill_id
+    allPayments = {};
+    paymentRows.forEach(row => {
+      if (!allPayments[row.bill_id]) {
+        allPayments[row.bill_id] = [];
+      }
+      allPayments[row.bill_id].push(row);
+    });
+  }
+
   const upcoming = [];
 
   for (const bill of bills) {
     const dueDate = resolveDueDate(bill, year, month);
     if (dueDate < todayStr || dueDate > cutoffStr) continue;
 
-    const payments = db.prepare(`
-      SELECT * FROM payments
-      WHERE bill_id = ? AND paid_date BETWEEN ? AND ?
-        AND deleted_at IS NULL
-      ORDER BY paid_date DESC
-    `).all(bill.id, start, end);
+    // Get payments for this bill from the batched results
+    const payments = allPayments[bill.id] || [];
 
     const row = buildTrackerRow(bill, payments, year, month, todayStr);
     if (row.status === 'paid') continue; // skip already paid