diff --git a/webform_conditional.module b/webform_conditional.module
index 3c7f93e..57aff4e 100644
--- a/webform_conditional.module
+++ b/webform_conditional.module
@@ -99,7 +99,8 @@ function webform_conditional_form_alter(&$form, $form_state, $form_id) {
     foreach ($rows as $row) {
       //see if field is on this page
       $extra = NULL;
-      if ($field = _webform_conditional_get_field($form['submitted'], $row['cid']) && !isset($js_fields[$row['form_key']])) {
+      $field = _webform_conditional_get_field($form['submitted'], $row['cid']);
+      if (!empty($field)) {
         $extra = unserialize($row['extra']);
         $row['extra'] = $extra;
         if (isset($extra['webform_conditional_cid']) && $extra['webform_conditional_cid']) {