diff --git a/BTCPayServer/Data/StoreDataExtensions.cs b/BTCPayServer/Data/StoreDataExtensions.cs
index 967ee1874..137ee15ed 100644
--- a/BTCPayServer/Data/StoreDataExtensions.cs
+++ b/BTCPayServer/Data/StoreDataExtensions.cs
@@ -52,7 +52,7 @@ namespace BTCPayServer.Data
                 result.PreferredExchange = CoinGeckoRateProvider.CoinGeckoName;
             if (result.PaymentMethodCriteria is null)
                 result.PaymentMethodCriteria = new List<PaymentMethodCriteria>();
-            result.PaymentMethodCriteria.RemoveAll(criteria => criteria.PaymentMethod is null);
+            result.PaymentMethodCriteria.RemoveAll(criteria => criteria?.PaymentMethod is null);
             return result;
         }