diff --git a/packages/server/postgres/migrations/1722637208553_SuggestAction-phase2.ts b/packages/server/postgres/migrations/1722637208553_SuggestAction-phase2.ts
new file mode 100644
index 00000000000..7414c33de7e
--- /dev/null
+++ b/packages/server/postgres/migrations/1722637208553_SuggestAction-phase2.ts
@@ -0,0 +1,100 @@
+import {Kysely, PostgresDialect, sql} from 'kysely'
+import {r} from 'rethinkdb-ts'
+import connectRethinkDB from '../../database/connectRethinkDB'
+import getPg from '../getPg'
+
+const toCreditCard = (creditCard: any) => {
+  if (!creditCard) return null
+  return sql<string>`(select json_populate_record(null::"CreditCard", ${JSON.stringify(creditCard)}))`
+}
+
+export async function up() {
+  await connectRethinkDB()
+  const pg = new Kysely<any>({
+    dialect: new PostgresDialect({
+      pool: getPg()
+    })
+  })
+  try {
+    console.log('Adding index')
+    await r
+      .table('SuggestedAction')
+      .indexCreate('createdAtId', (row: any) => [row('createdAt'), row('id')])
+      .run()
+    await r.table('SuggestedAction').indexWait().run()
+  } catch {
+    // index already exists
+  }
+  console.log('Adding index complete')
+  const MAX_PG_PARAMS = 65545
+  const PG_COLS = ['id', 'createdAt', 'priority', 'removedAt', 'type', 'teamId', 'userId'] as const
+  type SuggestedAction = {
+    [K in (typeof PG_COLS)[number]]: any
+  }
+  const BATCH_SIZE = Math.trunc(MAX_PG_PARAMS / PG_COLS.length)
+
+  let curcreatedAt = r.minval
+  let curId = r.minval
+  for (let i = 0; i < 1e6; i++) {
+    console.log('inserting row', i * BATCH_SIZE, curcreatedAt, curId)
+    const rawRowsToInsert = (await r
+      .table('SuggestedAction')
+      .between([curcreatedAt, curId], [r.maxval, r.maxval], {
+        index: 'createdAtId',
+        leftBound: 'open',
+        rightBound: 'closed'
+      })
+      .orderBy({index: 'createdAtId'})
+      .limit(BATCH_SIZE)
+      .pluck(...PG_COLS)
+      .run()) as SuggestedAction[]
+
+    const rowsToInsert = rawRowsToInsert.map((row) => ({
+      ...row
+    }))
+    if (rowsToInsert.length === 0) break
+    const lastRow = rowsToInsert[rowsToInsert.length - 1]
+    curcreatedAt = lastRow.createdAt
+    curId = lastRow.id
+    try {
+      await pg
+        .insertInto('SuggestedAction')
+        .values(rowsToInsert)
+        .onConflict((oc) => oc.doNothing())
+        .execute()
+    } catch (e) {
+      await Promise.all(
+        rowsToInsert.map(async (row) => {
+          try {
+            await pg
+              .insertInto('SuggestedAction')
+              .values(row)
+              .onConflict((oc) => oc.doNothing())
+              .execute()
+          } catch (e) {
+            if (e.constraint === 'fk_userId' || e.constraint === 'fk_teamId') {
+              console.log(`Skipping ${row.id} because it has no user/team`)
+              return
+            }
+            console.log(e, row)
+          }
+        })
+      )
+    }
+  }
+}
+
+export async function down() {
+  await connectRethinkDB()
+  try {
+    await r.table('SuggestedAction').indexDrop('createdAtId').run()
+  } catch {
+    // index already dropped
+  }
+  const pg = new Kysely<any>({
+    dialect: new PostgresDialect({
+      pool: getPg()
+    })
+  })
+  await sql`TRUNCATE TABLE "SuggestedAction" CASCADE`.execute(pg)
+}