diff --git a/conditional_fields.module b/conditional_fields.module
index d050e0b..ca19fbf 100644
--- a/conditional_fields.module
+++ b/conditional_fields.module
@@ -560,6 +560,7 @@ function conditional_fields_form_after_build($form, &$form_state) {
         _conditional_fields_element_add_property($dependent_form_field, '#element_validate', 'conditional_fields_dependent_validate', 'append');
       }
 
+      if (isset($state)) {
         // Add the $state into the correct logic group in $states.
         foreach ($state as $key => $constraints) {
           foreach ($constraints as $selector => $constraint) {
@@ -592,6 +593,7 @@ function conditional_fields_form_after_build($form, &$form_state) {
             unset($behaviors[CONDITIONAL_FIELDS_FIELD_EDIT_RESET_UNTRIGGERED]);
           }
         }
+      }
 
       // Execute custom behaviors callbacks.
       if (!empty($behaviors)) {