diff --git a/BTCPayServer/Controllers/InvoiceController.cs b/BTCPayServer/Controllers/InvoiceController.cs
index 96299651b..21f2fa83a 100644
--- a/BTCPayServer/Controllers/InvoiceController.cs
+++ b/BTCPayServer/Controllers/InvoiceController.cs
@@ -98,6 +98,7 @@ namespace BTCPayServer.Controllers
             entity.ExtendedNotifications = invoice.ExtendedNotifications;
             entity.NotificationURL = notificationUri?.AbsoluteUri;
             entity.BuyerInformation = Map<Invoice, BuyerInformation>(invoice);
+            entity.PaymentTolerance = storeBlob.PaymentTolerance;
             //Another way of passing buyer info to support
             FillBuyerInfo(invoice.Buyer, entity.BuyerInformation);
             if (entity?.BuyerInformation?.BuyerEmail != null)
diff --git a/BTCPayServer/Controllers/StoresController.cs b/BTCPayServer/Controllers/StoresController.cs
index 6a22d7f6d..2c4b42a60 100644
--- a/BTCPayServer/Controllers/StoresController.cs
+++ b/BTCPayServer/Controllers/StoresController.cs
@@ -431,6 +431,7 @@ namespace BTCPayServer.Controllers
             vm.MonitoringExpiration = storeBlob.MonitoringExpiration;
             vm.InvoiceExpiration = storeBlob.InvoiceExpiration;
             vm.LightningDescriptionTemplate = storeBlob.LightningDescriptionTemplate;
+            vm.PaymentTolerance = storeBlob.PaymentTolerance;
             return View(vm);
         }
 
@@ -496,6 +497,7 @@ namespace BTCPayServer.Controllers
             blob.MonitoringExpiration = model.MonitoringExpiration;
             blob.InvoiceExpiration = model.InvoiceExpiration;
             blob.LightningDescriptionTemplate = model.LightningDescriptionTemplate ?? string.Empty;
+            blob.PaymentTolerance = model.PaymentTolerance;
 
             if (StoreData.SetStoreBlob(blob))
             {
diff --git a/BTCPayServer/Data/StoreData.cs b/BTCPayServer/Data/StoreData.cs
index 30c86ad4e..9fa4224a2 100644
--- a/BTCPayServer/Data/StoreData.cs
+++ b/BTCPayServer/Data/StoreData.cs
@@ -247,6 +247,7 @@ namespace BTCPayServer.Data
         {
             InvoiceExpiration = 15;
             MonitoringExpiration = 60;
+            PaymentTolerance = 0;
             RequiresRefundEmail = true;
         }
         public bool NetworkFeeDisabled
@@ -326,6 +327,10 @@ namespace BTCPayServer.Data
             }
         }
 
+        [DefaultValue(0)]
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public double PaymentTolerance { get; set; }
+
         public BTCPayServer.Rating.RateRules GetRateRules(BTCPayNetworkProvider networkProvider)
         {
             if (!RateScripting || 
diff --git a/BTCPayServer/HostedServices/InvoiceNotificationManager.cs b/BTCPayServer/HostedServices/InvoiceNotificationManager.cs
index 86f24d7d4..25da15e71 100644
--- a/BTCPayServer/HostedServices/InvoiceNotificationManager.cs
+++ b/BTCPayServer/HostedServices/InvoiceNotificationManager.cs
@@ -312,6 +312,7 @@ namespace BTCPayServer.HostedServices
                 {
                     if (e.Name == "invoice_expired" ||
                        e.Name == "invoice_paidInFull" ||
+                       e.Name == "invoice_paidWithinTolerance" ||
                        e.Name == "invoice_failedToConfirm" ||
                        e.Name == "invoice_markedInvalid" ||
                        e.Name == "invoice_failedToConfirm" ||
diff --git a/BTCPayServer/HostedServices/InvoiceWatcher.cs b/BTCPayServer/HostedServices/InvoiceWatcher.cs
index 5aef0a738..d745de69e 100644
--- a/BTCPayServer/HostedServices/InvoiceWatcher.cs
+++ b/BTCPayServer/HostedServices/InvoiceWatcher.cs
@@ -96,11 +96,28 @@ namespace BTCPayServer.HostedServices
                     }
                 }
 
-                if (accounting.Paid < accounting.TotalDue && invoice.GetPayments().Count != 0 && invoice.ExceptionStatus != "paidPartial")
+                if (accounting.Paid < accounting.TotalDue && invoice.GetPayments().Count != 0)
                 {
-                    invoice.ExceptionStatus = "paidPartial";
-                    context.MarkDirty();
+                    if (invoice.PaymentTolerance > 0)
+                    {
+                        var tolerantAmount = (accounting.TotalDue.Satoshi * (invoice.PaymentTolerance / 100));
+                        var minimumTotalDue = accounting.TotalDue.Satoshi - tolerantAmount;
+                        if (accounting.Paid.Satoshi >= minimumTotalDue)
+                        {
+                            context.Events.Add(new InvoiceEvent(invoice, 1003, "invoide_paidWithinTolerance"));
+                            invoice.ExceptionStatus = "paidWithinTolerance";
+                            invoice.Status = "paid";
+                        }
+                    }
+
+                    if (invoice.ExceptionStatus != "paidPartial")
+                    {
+                        invoice.ExceptionStatus = "paidPartial";
+                        context.MarkDirty();
+                    }
                 }
+
+               
             }
 
             // Just make sure RBF did not cancelled a payment
diff --git a/BTCPayServer/Models/InvoiceResponse.cs b/BTCPayServer/Models/InvoiceResponse.cs
index 4ff6f21ed..33fd3d951 100644
--- a/BTCPayServer/Models/InvoiceResponse.cs
+++ b/BTCPayServer/Models/InvoiceResponse.cs
@@ -178,7 +178,7 @@ namespace BTCPayServer.Models
         }
 
         //"exceptionStatus":false
-        //Can be `paidPartial`, `paidOver`, or false
+        //Can be `paidPartial`, `paidOver`, `paidWithinTolerance` or false
         [JsonProperty("exceptionStatus")]
         public JToken ExceptionStatus
         {
diff --git a/BTCPayServer/Models/StoreViewModels/StoreViewModel.cs b/BTCPayServer/Models/StoreViewModels/StoreViewModel.cs
index ee4fbf318..c2fadcdd3 100644
--- a/BTCPayServer/Models/StoreViewModels/StoreViewModel.cs
+++ b/BTCPayServer/Models/StoreViewModels/StoreViewModel.cs
@@ -85,5 +85,13 @@ namespace BTCPayServer.Models.StoreViewModels
         {
             get; set;
         } = new List<LightningNode>();
+
+        [Display(Name = "Consider the invoice paid even if the paid amount is ... % less than expected")]
+        [Range(0, 100)]
+        public double PaymentTolerance
+        {
+            get;
+            set;
+        }
     }
 }
diff --git a/BTCPayServer/Services/Invoices/InvoiceEntity.cs b/BTCPayServer/Services/Invoices/InvoiceEntity.cs
index 0468de9f8..e30181706 100644
--- a/BTCPayServer/Services/Invoices/InvoiceEntity.cs
+++ b/BTCPayServer/Services/Invoices/InvoiceEntity.cs
@@ -314,6 +314,7 @@ namespace BTCPayServer.Services.Invoices
         }
         public bool ExtendedNotifications { get; set; }
         public List<InvoiceEventData> Events { get; internal set; }
+        public double PaymentTolerance { get; set; }
 
         public bool IsExpired()
         {
diff --git a/BTCPayServer/Views/Stores/UpdateStore.cshtml b/BTCPayServer/Views/Stores/UpdateStore.cshtml
index 83e4b60d9..cf5d2ef12 100644
--- a/BTCPayServer/Views/Stores/UpdateStore.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateStore.cshtml
@@ -44,6 +44,11 @@
                 <input asp-for="MonitoringExpiration" class="form-control" />
                 <span asp-validation-for="MonitoringExpiration" class="text-danger"></span>
             </div>
+            <div class="form-group">
+                <label asp-for="PaymentTolerance"></label>
+                <input asp-for="PaymentTolerance" class="form-control" />
+                <span asp-validation-for="PaymentTolerance" class="text-danger"></span>
+            </div>
             <div class="form-group">
                 <label asp-for="SpeedPolicy"></label>
                 <select asp-for="SpeedPolicy" class="form-control">