diff --git a/BTCPayServer/Controllers/UIStoresController.Onchain.cs b/BTCPayServer/Controllers/UIStoresController.Onchain.cs
index 3a2a8cdfa..c98e857de 100644
--- a/BTCPayServer/Controllers/UIStoresController.Onchain.cs
+++ b/BTCPayServer/Controllers/UIStoresController.Onchain.cs
@@ -538,12 +538,6 @@ public partial class UIStoresController
             }
         }
 
-        if (store.SpeedPolicy != vm.SpeedPolicy)
-        {
-            store.SpeedPolicy = vm.SpeedPolicy;
-            needUpdate = true;
-        }
-
         if (needUpdate)
         {
             store.SetPaymentMethodConfig(handler, derivation);
@@ -599,6 +593,12 @@ public partial class UIStoresController
             needUpdate = true;
         }
 
+        if (store.SpeedPolicy != vm.SpeedPolicy)
+        {
+            store.SpeedPolicy = vm.SpeedPolicy;
+            needUpdate = true;
+        }
+
         if (needUpdate)
         {
             await _storeRepo.UpdateStore(store);