diff --git a/.changeset/large-bottles-jam.md b/.changeset/large-bottles-jam.md
new file mode 100644
index 0000000000..b763257915
--- /dev/null
+++ b/.changeset/large-bottles-jam.md
@@ -0,0 +1,6 @@
+---
+"medusa-interfaces": patch
+"@medusajs/medusa": patch
+---
+
+Move search indexing into a separate subscriber to defer the work load
diff --git a/packages/medusa-interfaces/src/search-service.js b/packages/medusa-interfaces/src/search-service.js
index b9130833a9..9678480e2c 100644
--- a/packages/medusa-interfaces/src/search-service.js
+++ b/packages/medusa-interfaces/src/search-service.js
@@ -9,6 +9,10 @@ class SearchService extends BaseService {
     super()
   }
 
+  get options() {
+    return this.options_ ?? {}
+  }
+
   /**
    * Used to create an index
    * @param indexName {string} - the index name
@@ -32,7 +36,7 @@ class SearchService extends BaseService {
    * Used to index documents by the search engine provider
    * @param indexName {string} - the index name
    * @param documents {Array.<Object>} - documents array to be indexed
-   * @param type {Array.<Object>} - type of documents to be added (e.g: products, regions, orders, etc)
+   * @param type {string} - type of documents to be added (e.g: products, regions, orders, etc)
    * @return {Promise<{object}>} - returns response from search engine provider
    */
   addDocuments(indexName, documents, type) {
diff --git a/packages/medusa/src/loaders/index.ts b/packages/medusa/src/loaders/index.ts
index 7c67e47b1b..95aea94980 100644
--- a/packages/medusa/src/loaders/index.ts
+++ b/packages/medusa/src/loaders/index.ts
@@ -179,7 +179,7 @@ export default async ({
   const searchActivity = Logger.activity("Initializing search engine indexing")
   track("SEARCH_ENGINE_INDEXING_STARTED")
   await searchIndexLoader({ container })
-  const searchAct = Logger.success(searchActivity, "Indexing completed") || {}
+  const searchAct = Logger.success(searchActivity, "Indexing event emitted") || {}
   track("SEARCH_ENGINE_INDEXING_COMPLETED", { duration: searchAct.duration })
 
   return { container, dbConnection, app: expressApp }
diff --git a/packages/medusa/src/loaders/search-index.ts b/packages/medusa/src/loaders/search-index.ts
index d6d6ba89fe..21b118b252 100644
--- a/packages/medusa/src/loaders/search-index.ts
+++ b/packages/medusa/src/loaders/search-index.ts
@@ -1,67 +1,19 @@
-import ProductService from "../services/product"
-import { indexTypes } from "medusa-core-utils"
 import { MedusaContainer } from "../types/global"
 import DefaultSearchService from "../services/search"
 import { Logger } from "../types/global"
+import { EventBusService } from "../services"
 
-async function loadProductsIntoSearchEngine(
-  container: MedusaContainer
-): Promise<void> {
-  const searchService = container.resolve<DefaultSearchService>("searchService")
-  const productService = container.resolve<ProductService>("productService")
+export const SEARCH_INDEX_EVENT = "SEARCH_INDEX_EVENT"
 
-  const TAKE = 20
-  let hasMore = true
-
-  let lastSeenId = ""
-
-  while (hasMore) {
-    const products = await productService.list(
-      { id: { gt: lastSeenId } },
-      {
-        select: [
-          "id",
-          "title",
-          "status",
-          "subtitle",
-          "description",
-          "handle",
-          "is_giftcard",
-          "discountable",
-          "thumbnail",
-          "profile_id",
-          "collection_id",
-          "type_id",
-          "origin_country",
-          "created_at",
-          "updated_at",
-        ],
-        relations: [
-          "variants",
-          "tags",
-          "type",
-          "collection",
-          "variants.prices",
-          "images",
-          "variants.options",
-          "options",
-        ],
-        take: TAKE,
-        order: { id: "ASC" },
-      }
+function loadProductsIntoSearchEngine(container: MedusaContainer): void {
+  const logger: Logger = container.resolve<Logger>("logger")
+  const eventBusService: EventBusService = container.resolve("eventBusService")
+  eventBusService.emit(SEARCH_INDEX_EVENT, {}).catch((err) => {
+    logger.error(err)
+    logger.error(
+      "Something went wrong while emitting the search indexing event."
     )
-
-    if (products.length > 0) {
-      await searchService.addDocuments(
-        ProductService.IndexName,
-        products,
-        indexTypes.products
-      )
-      lastSeenId = products[products.length - 1].id
-    } else {
-      hasMore = false
-    }
-  }
+  })
 }
 
 export default async ({
diff --git a/packages/medusa/src/services/search.js b/packages/medusa/src/services/search.js
index 1bca213329..673faaceb4 100644
--- a/packages/medusa/src/services/search.js
+++ b/packages/medusa/src/services/search.js
@@ -5,12 +5,17 @@ import { SearchService } from "medusa-interfaces"
  * @extends SearchService
  */
 class DefaultSearchService extends SearchService {
-  constructor(container) {
+  constructor(container, options) {
     super()
 
     this.isDefault = true
 
     this.logger_ = container.logger
+    this.options_ = options
+  }
+
+  get options() {
+    return this.options_
   }
 
   createIndex(indexName, options) {
diff --git a/packages/medusa/src/subscribers/search-indexing.ts b/packages/medusa/src/subscribers/search-indexing.ts
new file mode 100644
index 0000000000..ad4893606a
--- /dev/null
+++ b/packages/medusa/src/subscribers/search-indexing.ts
@@ -0,0 +1,94 @@
+import EventBusService from "../services/event-bus"
+import { SEARCH_INDEX_EVENT } from "../loaders/search-index"
+import ProductService from "../services/product"
+import { indexTypes } from "medusa-core-utils"
+import { Product } from "../models"
+import { SearchService } from "../services"
+
+type InjectedDependencies = {
+  eventBusService: EventBusService
+  searchService: SearchService
+  productService: ProductService
+}
+
+class SearchIndexingSubscriber {
+  private readonly eventBusService_: EventBusService
+  private readonly searchService_: SearchService
+  private readonly productService_: ProductService
+
+  constructor({
+    eventBusService,
+    searchService,
+    productService,
+  }: InjectedDependencies) {
+    this.eventBusService_ = eventBusService
+    this.searchService_ = searchService
+    this.productService_ = productService
+
+    this.eventBusService_.subscribe(SEARCH_INDEX_EVENT, this.indexDocuments)
+  }
+
+  indexDocuments = async (): Promise<void> => {
+    const TAKE = this.searchService_?.options?.batch_size ?? 1000
+    let hasMore = true
+
+    let lastSeenId = ""
+
+    while (hasMore) {
+      const products = await this.retrieveNextProducts(lastSeenId, TAKE)
+
+      if (products.length > 0) {
+        await this.searchService_.addDocuments(
+          ProductService.IndexName,
+          products,
+          indexTypes.products
+        )
+        lastSeenId = products[products.length - 1].id
+      } else {
+        hasMore = false
+      }
+    }
+  }
+
+  protected async retrieveNextProducts(
+    lastSeenId: string,
+    take: number
+  ): Promise<Product[]> {
+    return await this.productService_.list(
+      { id: { gt: lastSeenId } },
+      {
+        select: [
+          "id",
+          "title",
+          "status",
+          "subtitle",
+          "description",
+          "handle",
+          "is_giftcard",
+          "discountable",
+          "thumbnail",
+          "profile_id",
+          "collection_id",
+          "type_id",
+          "origin_country",
+          "created_at",
+          "updated_at",
+        ],
+        relations: [
+          "variants",
+          "tags",
+          "type",
+          "collection",
+          "variants.prices",
+          "images",
+          "variants.options",
+          "options",
+        ],
+        take: take,
+        order: { id: "ASC" },
+      }
+    )
+  }
+}
+
+export default SearchIndexingSubscriber