diff --git a/app/services/invoices/refresh_draft_and_finalize_service.rb b/app/services/invoices/refresh_draft_and_finalize_service.rb
index 1011bd2d300..c7c32424cfb 100644
--- a/app/services/invoices/refresh_draft_and_finalize_service.rb
+++ b/app/services/invoices/refresh_draft_and_finalize_service.rb
@@ -29,20 +29,22 @@ def call
       end
 
       result.invoice = invoice.reload
-      unless invoice.closed?
-        SendWebhookJob.perform_later('invoice.created', invoice)
-        GeneratePdfAndNotifyJob.perform_later(invoice:, email: should_deliver_email?)
-        Integrations::Aggregator::Invoices::CreateJob.perform_later(invoice:) if invoice.should_sync_invoice?
-        Integrations::Aggregator::Invoices::Crm::CreateJob.perform_later(invoice:) if invoice.should_sync_crm_invoice?
-        Integrations::Aggregator::SalesOrders::CreateJob.perform_later(invoice:) if invoice.should_sync_sales_order?
-        Invoices::Payments::CreateService.new(invoice).call
-        Utils::SegmentTrack.invoice_created(invoice)
-      end
+      after_commit do
+        unless invoice.closed?
+          SendWebhookJob.perform_later('invoice.created', invoice)
+          GeneratePdfAndNotifyJob.perform_later(invoice:, email: should_deliver_email?)
+          Integrations::Aggregator::Invoices::CreateJob.perform_later(invoice:) if invoice.should_sync_invoice?
+          Integrations::Aggregator::Invoices::Crm::CreateJob.perform_later(invoice:) if invoice.should_sync_crm_invoice?
+          Integrations::Aggregator::SalesOrders::CreateJob.perform_later(invoice:) if invoice.should_sync_sales_order?
+          Invoices::Payments::CreateService.new(invoice).call
+          Utils::SegmentTrack.invoice_created(invoice)
+        end
 
-      invoice.credit_notes.each do |credit_note|
-        track_credit_note_created(credit_note)
-        SendWebhookJob.perform_later('credit_note.created', credit_note)
-        CreditNotes::GeneratePdfJob.perform_later(credit_note)
+        invoice.credit_notes.each do |credit_note|
+          track_credit_note_created(credit_note)
+          SendWebhookJob.perform_later('credit_note.created', credit_note)
+          CreditNotes::GeneratePdfJob.perform_later(credit_note)
+        end
       end
 
       result
diff --git a/app/services/wallets/balance/update_ongoing_service.rb b/app/services/wallets/balance/update_ongoing_service.rb
index 6acd8894076..4f62e2ac82c 100644
--- a/app/services/wallets/balance/update_ongoing_service.rb
+++ b/app/services/wallets/balance/update_ongoing_service.rb
@@ -15,11 +15,13 @@ def call
         update_params = compute_update_params
         wallet.update!(update_params)
 
-        if update_params[:depleted_ongoing_balance] == true
-          SendWebhookJob.perform_later('wallet.depleted_ongoing_balance', wallet)
-        end
+        after_commit do
+          if update_params[:depleted_ongoing_balance] == true
+            SendWebhookJob.perform_later('wallet.depleted_ongoing_balance', wallet)
+          end
 
-        ::Wallets::ThresholdTopUpService.call(wallet:)
+          ::Wallets::ThresholdTopUpService.call(wallet:)
+        end
 
         result.wallet = wallet
         result