diff --git a/uuid_features.module b/uuid_features.module
index 1ac359c..0cd1acc 100644
--- a/uuid_features.module
+++ b/uuid_features.module
@@ -76,19 +76,28 @@ function uuid_features_load_module_includes() {
  * When exporting a vocabulary, include its terms.
  */
 function uuid_features_features_pipe_taxonomy_alter(&$pipe, $data, $export) {
-  if ($vocab = taxonomy_vocabulary_machine_name_load($data)) {
-    $export['features']['uuid_term'] = array();
-    foreach (taxonomy_get_tree($vocab->vid) as $term) {
-      uuid_term_features_get_dependencies($export, $term->uuid);
+  if (variable_get('uuid_features_vocabulary_terms', FALSE) == TRUE) {
+    if ($vocab = taxonomy_vocabulary_machine_name_load($data)) {
+      $export['features']['uuid_term'] = array();
+      foreach (taxonomy_get_tree($vocab->vid) as $term) {
+        uuid_term_features_get_dependencies($export, $term->uuid);
+      }
+      $pipe['uuid_term'] = $export['features']['uuid_term'];
     }
-    $pipe['uuid_term'] = $export['features']['uuid_term'];
   }
 }
-
 /**
  * Menu callback to configure module settings.
  */
 function uuid_features_settings($form, &$form_state) {
+
+  $form['settings']['uuid_features_vocabulary_terms'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Auto detect uuid terms'),
+    '#description' => t('When exporting a vocabulary, include its terms.'),
+    '#default_value' => variable_get('uuid_features_vocabulary_terms', FALSE),
+  );
+
   $entity_info = entity_get_info();
   foreach ($entity_info as $type => $info) {
     foreach($info['bundles'] as $bundle => $bundle_info) {