diff --git a/dz3r-model/src/main/java/net/sf/dz3r/model/Zone.java b/dz3r-model/src/main/java/net/sf/dz3r/model/Zone.java
index e55314b94..fd605aeeb 100644
--- a/dz3r-model/src/main/java/net/sf/dz3r/model/Zone.java
+++ b/dz3r-model/src/main/java/net/sf/dz3r/model/Zone.java
@@ -202,7 +202,7 @@ public Flux<Signal<ZoneStatus, String>> compute(Flux<Signal<Double, String>> in)
 
         var source = Optional.ofNullable(economizer)
                 .map(eco -> eco.compute(combined))
-                .orElse(in);
+                .orElse(combined);
 
         // Since the zone doesn't need the payload, but the thermostat does, need to translate the input
         var stage0 = source