diff --git a/src/infra/kysely-sync.ts b/src/infra/kysely-sync.ts
index d25e72ab3ae..10fe1432eac 100644
--- a/src/infra/kysely-sync.ts
+++ b/src/infra/kysely-sync.ts
@@ -49,7 +49,7 @@ export function executeCompiledSqliteQuerySync<Row>(
 
 export function executeSqliteQuerySync<Row>(
   db: DatabaseSync,
-  query: CompilableQuery,
+  query: CompilableQuery<Row>,
 ): QueryResult<Row> {
   return executeCompiledSqliteQuerySync<Row>(db, query.compile());
 }
diff --git a/src/infra/state-migrations.ts b/src/infra/state-migrations.ts
index 26b7393338d..0390e5adf7a 100644
--- a/src/infra/state-migrations.ts
+++ b/src/infra/state-migrations.ts
@@ -1923,7 +1923,7 @@ function countGlobalAgentOwnedSqliteRows(params: {
     const kysely = getNodeSqliteKysely<LegacyGlobalAgentOwnedMigrationDatabase>(db);
     const row = executeCompiledSqliteQuerySync<SqliteCountRow>(
       db,
-      sql`SELECT COUNT(*) AS count FROM ${sql.raw(params.table)}`.compile(kysely),
+      sql`SELECT COUNT(*) AS count FROM ${sql.id(params.table)}`.compile(kysely),
     ).rows[0];
     return typeof row?.count === "bigint" ? Number(row.count) : row?.count;
   } catch {