diff --git a/hems/fnn/fnn.go b/hems/fnn/fnn.go
index 32bd16780..01f90dad8 100644
--- a/hems/fnn/fnn.go
+++ b/hems/fnn/fnn.go
@@ -120,7 +120,8 @@ func (c *Fnn) SetUpdated(f func()) {
 
 // Run starts the FNN control loop.
 func (c *Fnn) Run() {
-	for range time.Tick(c.interval) {
+	// run immediately, then on every tick
+	for tick := time.Tick(c.interval); ; <-tick {
 		if err := c.runCurtail(); err != nil {
 			c.log.ERROR.Println(err)
 		}
diff --git a/hems/relay/relay.go b/hems/relay/relay.go
index 4fe63bab8..601da0bf4 100644
--- a/hems/relay/relay.go
+++ b/hems/relay/relay.go
@@ -88,7 +88,8 @@ func (c *Relay) SetUpdated(f func()) {
 }
 
 func (c *Relay) Run() {
-	for range time.Tick(c.interval) {
+	// run immediately, then on every tick
+	for tick := time.Tick(c.interval); ; <-tick {
 		if err := c.run(); err != nil {
 			c.log.ERROR.Println(err)
 		}
diff --git a/tests/hems-yaml.evcc.yaml b/tests/hems-yaml.evcc.yaml
index 8c958d028..ab004e8c8 100644
--- a/tests/hems-yaml.evcc.yaml
+++ b/tests/hems-yaml.evcc.yaml
@@ -15,4 +15,4 @@ hems:
   maxPower: 4200
   limit:
     source: const
-    value: true
+    value: false # inactive: avoids recording a grid session so the locked modal shows no history