diff --git a/dz3r-bootstrap/src/main/java/net/sf/dz3r/runtime/config/mqtt/MqttDeviceResolver.java b/dz3r-bootstrap/src/main/java/net/sf/dz3r/runtime/config/mqtt/MqttDeviceResolver.java
index 362679fcc..8d9022e43 100644
--- a/dz3r-bootstrap/src/main/java/net/sf/dz3r/runtime/config/mqtt/MqttDeviceResolver.java
+++ b/dz3r-bootstrap/src/main/java/net/sf/dz3r/runtime/config/mqtt/MqttDeviceResolver.java
@@ -220,7 +220,7 @@ private Flux<Map.Entry<String, S>> getSwitches(Map<MqttEndpointSpec, MqttAdapter
                     var s = createSwitch(
                             id,
                             c.switchConfig.heartbeat(),
-                            c.switchConfig.pace(),
+                            getOrDefaultPace(c.switchConfig.pace(), Duration.ofMinutes(1), "switch=" + id),
                             adapter,
                             address,
                             c.switchConfig.availabilityTopic());
@@ -232,6 +232,16 @@ private Flux<Map.Entry<String, S>> getSwitches(Map<MqttEndpointSpec, MqttAdapter
                 });
     }
 
+    private Duration getOrDefaultPace(Duration pace, Duration defaultPace, String target) {
+
+        if (pace == null) {
+            logger.debug("using default pace={} for {}", defaultPace, target);
+            return defaultPace;
+        }
+
+        return pace;
+    }
+
     public Flux<Map.Entry<String, F>> getFans() {
         return getFans(endpoint2adapter, fanConfigs);
     }
@@ -251,7 +261,7 @@ private Flux<Map.Entry<String, F>> getFans(Map<MqttEndpointSpec, MqttAdapter> en
                     var s = createFan(
                             id,
                             c.fanConfig().heartbeat(),
-                            c.fanConfig().pace(),
+                            getOrDefaultPace(c.fanConfig.pace(), Duration.ofMinutes(1), "fan=" + id),
                             adapter,
                             address,
                             c.fanConfig.availabilityTopic());