diff --git a/internal-packages/database/prisma/migrations/20250912153951_add_waitpoint_dashboard_index/migration.sql b/internal-packages/database/prisma/migrations/20250912153951_add_waitpoint_dashboard_index/migration.sql
new file mode 100644
index 0000000000..4b6df3fa49
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250912153951_add_waitpoint_dashboard_index/migration.sql
@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "Waitpoint_environmentId_type_id_idx" ON "public"."Waitpoint"("environmentId", "type", "id" DESC);
diff --git a/internal-packages/database/prisma/schema.prisma b/internal-packages/database/prisma/schema.prisma
index 240e72a506..d67b2489c8 100644
--- a/internal-packages/database/prisma/schema.prisma
+++ b/internal-packages/database/prisma/schema.prisma
@@ -1062,6 +1062,8 @@ model Waitpoint {
   @@index([environmentId, type, createdAt(sort: Desc)])
   /// Status filtering
   @@index([environmentId, type, status])
+  /// For the waitpoint token dashboard page
+  @@index([environmentId, type, id(sort: Desc)])
 }
 
 enum WaitpointType {