diff --git a/app/jobs/enrich_data_job.rb b/app/jobs/enrich_data_job.rb
deleted file mode 100644
index f20875c826b..00000000000
--- a/app/jobs/enrich_data_job.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class EnrichDataJob < ApplicationJob
-  queue_as :latency_high
-
-  def perform(account)
-    account.enrich_data
-  end
-end
diff --git a/app/jobs/enrich_transaction_batch_job.rb b/app/jobs/enrich_transaction_batch_job.rb
new file mode 100644
index 00000000000..22d026f7d1b
--- /dev/null
+++ b/app/jobs/enrich_transaction_batch_job.rb
@@ -0,0 +1,8 @@
+class EnrichTransactionBatchJob < ApplicationJob
+  queue_as :latency_high
+
+  def perform(account, batch_size = 100, offset = 0)
+    enricher = Account::DataEnricher.new(account)
+    enricher.enrich_transaction_batch(batch_size, offset)
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index c11b532d716..23aaaf71290 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -130,10 +130,6 @@ def enrich_data
     DataEnricher.new(self).run
   end
 
-  def enrich_data_later
-    EnrichDataJob.perform_later(self)
-  end
-
   def update_with_sync!(attributes)
     should_update_balance = attributes[:balance] && attributes[:balance].to_d != balance
 
diff --git a/app/models/account/data_enricher.rb b/app/models/account/data_enricher.rb
index 924d5894dda..59979df067f 100644
--- a/app/models/account/data_enricher.rb
+++ b/app/models/account/data_enricher.rb
@@ -8,49 +8,61 @@ def initialize(account)
   end
 
   def run
-    enrich_transactions
-  end
-
-  private
-    def enrich_transactions
-      candidates = account.entries.account_transactions.includes(entryable: [ :merchant, :category ])
+    total_unenriched = account.entries.account_transactions
+      .joins("JOIN account_transactions at ON at.id = account_entries.entryable_id AND account_entries.entryable_type = 'Account::Transaction'")
+      .where("account_entries.enriched_at IS NULL OR at.merchant_id IS NULL OR at.category_id IS NULL")
+      .count
 
-      Rails.logger.info("Enriching #{candidates.count} transactions for account #{account.id}")
+    if total_unenriched > 0
+      batch_size = 50
+      batches = (total_unenriched.to_f / batch_size).ceil
 
-      merchants = {}
+      batches.times do |batch|
+        EnrichTransactionBatchJob.perform_later(account, batch_size, batch * batch_size)
+      end
+    end
+  end
 
-      candidates.each do |entry|
-        if entry.enriched_at.nil? || entry.entryable.merchant_id.nil? || entry.entryable.category_id.nil?
-          begin
-            next unless entry.name.present?
+  def enrich_transaction_batch(batch_size = 50, offset = 0)
+    candidates = account.entries.account_transactions
+      .includes(entryable: [ :merchant, :category ])
+      .joins("JOIN account_transactions at ON at.id = account_entries.entryable_id AND account_entries.entryable_type = 'Account::Transaction'")
+      .where("account_entries.enriched_at IS NULL OR at.merchant_id IS NULL OR at.category_id IS NULL")
+      .offset(offset)
+      .limit(batch_size)
 
-            info = self.class.synth_provider.enrich_transaction(entry.name).info
+    Rails.logger.info("Enriching batch of #{candidates.count} transactions for account #{account.id} (offset: #{offset})")
 
-            next unless info.present?
+    merchants = {}
 
-            if info.name.present?
-              merchant = merchants[info.name] ||= account.family.merchants.find_or_create_by(name: info.name)
+    candidates.each do |entry|
+      begin
+        info = self.class.synth_provider.enrich_transaction(entry.name).info
 
-              if info.icon_url.present?
-                merchant.icon_url = info.icon_url
-              end
-            end
+        next unless info.present?
 
-            entryable_attributes = { id: entry.entryable_id }
-            entryable_attributes[:merchant_id] = merchant.id if merchant.present? && entry.entryable.merchant_id.nil?
+        if info.name.present?
+          merchant = merchants[info.name] ||= account.family.merchants.find_or_create_by(name: info.name)
 
-            Account.transaction do
-              merchant.save! if merchant.present?
-              entry.update!(
-                enriched_at: Time.current,
-                enriched_name: info.name,
-                entryable_attributes: entryable_attributes
-              )
-            end
-          rescue => e
-            Rails.logger.warn("Error enriching transaction #{entry.id}: #{e.message}")
+          if info.icon_url.present?
+            merchant.icon_url = info.icon_url
           end
         end
+
+        entryable_attributes = { id: entry.entryable_id }
+        entryable_attributes[:merchant_id] = merchant.id if merchant.present? && entry.entryable.merchant_id.nil?
+
+        Account.transaction do
+          merchant.save! if merchant.present?
+          entry.update!(
+            enriched_at: Time.current,
+            enriched_name: info.name,
+            entryable_attributes: entryable_attributes
+          )
+        end
+      rescue => e
+        Rails.logger.warn("Error enriching transaction #{entry.id}: #{e.message}")
       end
     end
+  end
 end
diff --git a/app/models/account/syncer.rb b/app/models/account/syncer.rb
index 8f5ebc3af74..867c9052c4c 100644
--- a/app/models/account/syncer.rb
+++ b/app/models/account/syncer.rb
@@ -15,8 +15,7 @@ def run
 
     # Enrich if user opted in or if we're syncing transactions from a Plaid account on the hosted app
     if account.family.data_enrichment_enabled? || (account.plaid_account_id.present? && Rails.application.config.app_mode.hosted?)
-      # Temporarily disable until optimizations complete
-      # account.enrich_data_later
+      account.enrich_data
     else
       Rails.logger.info("Data enrichment is disabled, skipping enrichment for account #{account.id}")
     end