diff --git a/tariff/solcast.go b/tariff/solcast.go
index 61e1b54c0..764934142 100644
--- a/tariff/solcast.go
+++ b/tariff/solcast.go
@@ -57,7 +57,7 @@ func NewSolcastFromConfig(other map[string]interface{}) (api.Tariff, error) {
 		log:    log,
 		sites:  []string{cc.Site},
 		Helper: request.NewHelper(log),
-		data:   util.NewMonitor[api.Rates](2 * time.Hour),
+		data:   util.NewMonitor[api.Rates](6 * /*len(cc.Sites)*/ time.Hour),
 	}
 
 	t.Client.Transport = transport.BearerAuth(cc.Token, t.Client.Transport)
diff --git a/tariff/tariff.go b/tariff/tariff.go
index ac836556f..7a119a91f 100644
--- a/tariff/tariff.go
+++ b/tariff/tariff.go
@@ -72,7 +72,7 @@ func NewConfigurableFromConfig(ctx context.Context, other map[string]interface{}
 		embed:  &cc.embed,
 		typ:    cc.Type,
 		priceG: priceG,
-		data:   util.NewMonitor[api.Rates](2 * time.Hour),
+		data:   util.NewMonitor[api.Rates](2 * cc.Interval),
 	}
 
 	if forecastG != nil {