diff --git a/packages/server/src/appMigrations/migrations.ts b/packages/server/src/appMigrations/migrations.ts
index aeb4844751..7437753ada 100644
--- a/packages/server/src/appMigrations/migrations.ts
+++ b/packages/server/src/appMigrations/migrations.ts
@@ -10,6 +10,6 @@ export const MIGRATIONS: AppMigration[] = [
   {
     id: "20240604153647_initial_sqs",
     func: m20240604153647_initial_sqs,
-    disabled: !env.SQS_MIGRATION_ENABLE,
+    disabled: !(env.SQS_MIGRATION_ENABLE || env.SQS_SEARCH_ENABLE),
   },
 ]
diff --git a/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts b/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
index 6ac0fc2523..da435705c1 100644
--- a/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
+++ b/packages/server/src/appMigrations/migrations/20240604153647_initial_sqs.ts
@@ -40,7 +40,7 @@ const migration = async () => {
   // only do initial search if environment is using SQS already
   // initial search makes sure that all the indexes have been created
   // and are ready to use, avoiding any initial waits for large tables
-  if (env.SQS_MIGRATION_ENABLE) {
+  if (env.SQS_MIGRATION_ENABLE || env.SQS_SEARCH_ENABLE) {
     const tables = await sdk.tables.getAllInternalTables()
     // do these one by one - running in parallel could cause problems
     for (let table of tables) {