diff --git a/src/Charcoal/Ui/ConditionalizableTrait.php b/src/Charcoal/Ui/ConditionalizableTrait.php
index 95ee314..cf917c9 100644
--- a/src/Charcoal/Ui/ConditionalizableTrait.php
+++ b/src/Charcoal/Ui/ConditionalizableTrait.php
@@ -68,7 +68,7 @@ public function setCondition($condition)
             );
         }
 
-        unset($this->resolvedCondition);
+        $this->resolvedCondition = null;
         $this->condition = $condition;
         return $this;
     }
@@ -105,6 +105,8 @@ final protected function parseConditionalLogic($condition)
     /**
      * Parse the widget's conditional logic.
      *
+     * @todo Simplify logic by moving `form()` method lookup to relevant form widget.
+     *
      * @param  callable|string $condition The callable or renderable condition.
      * @return boolean
      */