diff --git a/aet_insert/aet_insert.module b/aet_insert/aet_insert.module
index ba808ba..6a7bced 100644
--- a/aet_insert/aet_insert.module
+++ b/aet_insert/aet_insert.module
@@ -227,12 +227,19 @@ function aet_insert_form_field_ui_field_edit_form_submit($form, &$form_state) {
 
   $field_identifier = $entity_type . '_' . $field_name;
 
-  if (isset($form_state['values']['aet_insert_use_' . $field_identifier])) {
-    db_insert('aet_insert') // Table name no longer needs {}
-    ->fields(array(
-      'entity_type' => $entity_type,
-      'field_name' => $field_name,
-    ))
+  if (isset($form_state['values']['aet_insert_use_' . $field_identifier]) &&
+     !empty($form_state['values']['aet_insert_use_' . $field_identifier])) {
+     db_insert('aet_insert') // Table name no longer needs {}
+     ->fields(array(
+       'entity_type' => $entity_type,
+       'field_name' => $field_name,
+     ))
+     ->execute();
+  }else{
+    // Delete the field from aet_insert table.
+    db_delete('aet_insert')
+    ->condition('aet_insert.entity_type', $entity_type)
+    ->condition('aet_insert.field_name', $field_name)
     ->execute();
   }
 }