diff --git a/src/tink/state/State.hx b/src/tink/state/State.hx
index 12cf542..a64c10f 100644
--- a/src/tink/state/State.hx
+++ b/src/tink/state/State.hx
@@ -158,12 +158,11 @@ private class SimpleState<T> extends Invalidator implements StateObject<T> {
       warn('Updating state in a binding');
     #end
 
-    Scheduler.atomically(() -> 
-      if (!comparator.eq(value, this.value)) {
+    if (!comparator.eq(value, this.value)) 
+      Scheduler.atomically(() -> {
         this.value = value;
         fire();
-      }
-    );
+      }, true);
   
     return value;
   }