diff --git a/core/misc/states.js b/core/misc/states.js
index 88adc0c..7903757 100644
--- a/core/misc/states.js
+++ b/core/misc/states.js
@@ -173,6 +173,10 @@
 
           // Make sure the event we just bound ourselves to is actually fired.
           new states.Trigger({selector: selector, state: state});
+
+          // Reevaluate conditions and trigger to be sure default value like
+          // null is handled.
+          this.reevaluate();
         }
       }
     },
@@ -218,7 +222,7 @@
      */
     update: function (selector, state, value) {
       // Only act when the 'new' value is actually new.
-      if (value !== this.values[selector][state.name] || $(selector).prop('multiple')) {
+      if (value !== this.values[selector][state.name]) {
         this.values[selector][state.name] = value;
         this.reevaluate();
       }