diff --git a/src/db/database.js b/src/db/database.js
index f6b5bb8..bc546ca 100644
--- a/src/db/database.js
+++ b/src/db/database.js
@@ -93,4 +93,10 @@ if (!lfInfo.some(c => c.name === 'account_id')) {
   `);
 }
 
+// Create account_id indexes unconditionally (safe after migrations have run)
+db.exec(`
+  CREATE INDEX IF NOT EXISTS idx_checks_account ON checks(account_id);
+  CREATE INDEX IF NOT EXISTS idx_layout_account ON layout_fields(account_id);
+`);
+
 module.exports = db;
diff --git a/src/db/schema.sql b/src/db/schema.sql
index 4323d35..a73e024 100644
--- a/src/db/schema.sql
+++ b/src/db/schema.sql
@@ -71,5 +71,3 @@ CREATE TABLE IF NOT EXISTS layout_fields (
 CREATE INDEX IF NOT EXISTS idx_checks_date      ON checks(check_date);
 CREATE INDEX IF NOT EXISTS idx_checks_printed   ON checks(printed);
 CREATE INDEX IF NOT EXISTS idx_checks_check_no  ON checks(check_no);
-CREATE INDEX IF NOT EXISTS idx_checks_account   ON checks(account_id);
-CREATE INDEX IF NOT EXISTS idx_layout_account   ON layout_fields(account_id);