diff --git a/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php b/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php
old mode 100644
new mode 100755
index 075b54d..5dcab39
--- a/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php
+++ b/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php
@@ -93,6 +93,7 @@ class EntityReferenceBehavior_TaxonomyIndex extends EntityReference_BehaviorHand
       $tid_all = array();
       foreach (field_info_instances('node', $node->type) as $instance) {
         $field_name = $instance['field_name'];
+        $taxonomy_index_status = isset($instance['settings']['behaviors']['taxonomy-index']['status']) && !empty($instance['settings']['behaviors']['taxonomy-index']['status']);
         $field = field_info_field($field_name);
         if (!empty($field['settings']['target_type']) && $field['settings']['target_type'] == 'taxonomy_term' && $field['storage']['type'] == 'field_sql_storage') {
           // If a field value is not set in the node object when node_save() is
@@ -109,7 +110,9 @@ class EntityReferenceBehavior_TaxonomyIndex extends EntityReference_BehaviorHand
           foreach (field_available_languages('node', $field) as $langcode) {
             if (!empty($items[$langcode])) {
               foreach ($items[$langcode] as $item) {
-                $tid_all[$item['target_id']] = $item['target_id'];
+                if ($taxonomy_index_status) {
+                  $tid_all[$item['target_id']] = $item['target_id'];
+                }
               }
             }
           }
@@ -133,7 +136,9 @@ class EntityReferenceBehavior_TaxonomyIndex extends EntityReference_BehaviorHand
           foreach (field_available_languages('node', $field) as $langcode) {
             if (!empty($items[$langcode])) {
               foreach ($items[$langcode] as $item) {
-                $original_tid_all[$item['tid']] = $item['tid'];
+                if ($taxonomy_index_status) {
+                  $original_tid_all[$item['tid']] = $item['tid'];
+                }
               }
             }
           }
diff --git a/plugins/behavior/taxonomy-index.inc b/plugins/behavior/taxonomy-index.inc
old mode 100644
new mode 100755
index 1a29d6e..d7f89fe
--- a/plugins/behavior/taxonomy-index.inc
+++ b/plugins/behavior/taxonomy-index.inc
@@ -11,6 +11,6 @@ if (module_exists('taxonomy')) {
     'description' => t('Include the term references created by instances of this field carried by node entities in the core {taxonomy_index} table. This will allow various modules to handle them like core term_reference fields.'),
     'class' => 'EntityReferenceBehavior_TaxonomyIndex',
     'behavior type' => 'instance',
-    'force enabled' => TRUE,
+    'force enabled' => FALSE,
   );
 }