diff --git a/BTCPayServer/Controllers/StoresController.cs b/BTCPayServer/Controllers/StoresController.cs
index 6bc7df0e3..b7eed501f 100644
--- a/BTCPayServer/Controllers/StoresController.cs
+++ b/BTCPayServer/Controllers/StoresController.cs
@@ -236,6 +236,11 @@ namespace BTCPayServer.Controllers
             }
             model.SetCryptoCurrencies(_ExplorerProvider, model.DefaultCryptoCurrency);
             model.SetLanguages(_LangService, model.DefaultLang);
+
+            if(!ModelState.IsValid)
+            {
+                return View(model);
+            }
             blob.DefaultLang = model.DefaultLang;
             blob.AllowCoinConversion = model.AllowCoinConversion;
             blob.LightningMaxValue = lightningMaxValue;
diff --git a/BTCPayServer/Services/Rates/CachedDefaultRateProviderFactory.cs b/BTCPayServer/Services/Rates/CachedDefaultRateProviderFactory.cs
index df66d62c9..e417a7142 100644
--- a/BTCPayServer/Services/Rates/CachedDefaultRateProviderFactory.cs
+++ b/BTCPayServer/Services/Rates/CachedDefaultRateProviderFactory.cs
@@ -30,7 +30,8 @@ namespace BTCPayServer.Services.Rates
 
         public IRateProvider RateProvider { get; set; }
 
-        public TimeSpan CacheSpan { get; set; } = TimeSpan.FromMinutes(1.0);
+        // We use 15 min because of limits with free version of bitcoinaverage
+        public TimeSpan CacheSpan { get; set; } = TimeSpan.FromMinutes(15.0);
         public TimeSpan LongCacheSpan { get; set; } = TimeSpan.FromMinutes(15.0);
         public IRateProvider GetRateProvider(BTCPayNetwork network, bool longCache)
         {