diff --git a/field_conditional_state/field_conditional_state.admin.inc b/field_conditional_state/field_conditional_state.admin.inc
index d9f3f98..0b70799 100644
--- a/field_conditional_state/field_conditional_state.admin.inc
+++ b/field_conditional_state/field_conditional_state.admin.inc
@@ -131,8 +131,9 @@ function field_conditional_state_settings_form_validate($form, &$form_state) {
     $target_field = $form_state['values']['trigger_field'];
     $control_field = $form_state['values']['add_field_state']['control_field'];
     $state_type = $form_state['values']['add_field_state']['state_type'];
-    $query_args = array(':field_name' => $target_field, ':control_field' => $control_field, ':state' => $state_type);
-    $result = db_query("SELECT count(*) as count FROM {field_conditional_state} WHERE field_name = :field_name AND control_field = :control_field AND state = :state", $query_args)->fetchObject();
+    $bundle = $form_state['values']['bundle'];
+    $query_args = array(':field_name' => $target_field, ':control_field' => $control_field, ':state' => $state_type, 'bundle' => $bundle);
+    $result = db_query("SELECT count(*) as count FROM {field_conditional_state} WHERE field_name = :field_name AND control_field = :control_field AND state = :state AND bundle = :bundle", $query_args)->fetchObject();
     if ($result->count > 0) {
       form_set_error("add_field_state][state_type", t("You already have this state type between these two fields."));
     }