diff --git a/BTCPayServer/Services/Invoices/InvoiceRepository.cs b/BTCPayServer/Services/Invoices/InvoiceRepository.cs
index ea2231f2b..43acf5305 100644
--- a/BTCPayServer/Services/Invoices/InvoiceRepository.cs
+++ b/BTCPayServer/Services/Invoices/InvoiceRepository.cs
@@ -508,7 +508,8 @@ namespace BTCPayServer.Services.Invoices
 
                 try
                 {
-                    await context.SaveChangesAsync().ConfigureAwait(false);
+                    if (await context.SaveChangesAsync().ConfigureAwait(false) == 0)
+                        return null;
                 }
                 catch(DbUpdateException) { return null; } // Already exists
                 AddToTextSearch(invoiceId, paymentData.GetSearchTerms());