diff --git a/dz3r-model/src/main/java/net/sf/dz3r/device/actuator/AbstractSwitch.java b/dz3r-model/src/main/java/net/sf/dz3r/device/actuator/AbstractSwitch.java
index 3878dfb7e..0a352f42e 100644
--- a/dz3r-model/src/main/java/net/sf/dz3r/device/actuator/AbstractSwitch.java
+++ b/dz3r-model/src/main/java/net/sf/dz3r/device/actuator/AbstractSwitch.java
@@ -177,8 +177,12 @@ public Mono<Boolean> getState() {
                     } finally {
                         ThreadContext.pop();
                     }
-                })
-                .subscribeOn(scheduler);
+                });
+
+                // VT: NOTE: Having this here breaks stuff, but now that it's gone,
+                // need a thorough review because likely something else is now broken.
+                // More: https://github.com/home-climate-control/dz/issues/271
+                // .subscribeOn(scheduler);
     }
 
     protected Scheduler getScheduler() {