diff --git apachesolr.module apachesolr.module
index 04b7f04..e97a1f8 100644
--- apachesolr.module
+++ apachesolr.module
@@ -2500,27 +2500,32 @@ function field_apachesolr_field_mappings() {
       'display_callback' => 'apachesolr_fields_list_display_callback',
       'indexing_callback' => 'apachesolr_fields_list_indexing_callback',
       'index_type' => 'string',
+      'facets' => TRUE,
     ),
     'list_float' => array(
       'display_callback' => 'apachesolr_fields_list_display_callback',
       'indexing_callback' => 'apachesolr_fields_list_indexing_callback',
       'index_type' => 'string',
+      'facets' => TRUE,
     ),
     'list_text' => array(
       'display_callback' => 'apachesolr_fields_list_display_callback',
       'indexing_callback' => 'apachesolr_fields_list_indexing_callback',
       'index_type' => 'string',
+      'facets' => TRUE,
     ),
     'list_boolean' => array(
       'display_callback' => 'apachesolr_fields_list_display_callback',
       'indexing_callback' => 'apachesolr_fields_list_indexing_callback',
       'index_type' => 'boolean',
+      'facets' => TRUE,
     ),
     'taxonomy_term_reference' => array(
       'display_callback' => 'apachesolr_taxonomy_get_term',
       'indexing_callback' => 'apachesolr_term_reference_indexing_callback',
       'index_type' => 'integer',
       'facet_block_callback' => 'apachesolr_search_taxonomy_facet_block',
+      'facets' => TRUE,
     ),
   );
 
diff --git apachesolr_search.module apachesolr_search.module
index 81b1a83..02cf509 100644
--- apachesolr_search.module
+++ apachesolr_search.module
@@ -833,20 +833,22 @@ function apachesolr_search_apachesolr_facets() {
   // Get field facets.
   $fields = apachesolr_entity_fields('node');
   foreach ($fields as $index_key => $field_info) {
-    $facets[$index_key] = array(
+    if ($field_info['facets']) {
+      $facets[$index_key] = array(
         'info' => t('@module_name Field: Filter by @field_dname (@field_name)', array('@module_name' => $field_info['module_name'], '@field_name' => $field_info['field']['field_name'], '@field_dname' => $field_info['display_name'])),
         'facet_field' => $index_key,
         'content_types' => $field_info['bundles'],
-    ) + $field_info;
-
-    // If we're a single hierarchical vocabulary, declare as hierarchical.
-    if ($field_info['field']['module'] == 'taxonomy' && $field_info['field']['type'] == 'taxonomy_term_reference') {
-      $vocabs = $field_info['field']['settings']['allowed_values'];
-      if ((count($vocabs) == 1)) {
-        $vocab = array_shift($vocabs);
-        $vocab = taxonomy_vocabulary_machine_name_load($vocab['vocabulary']);
-        if ($vocab->hierarchy == 1) {
-          $facets[$index_key]['hierarchical'] = TRUE;
+      ) + $field_info;
+
+      // If we're a single hierarchical vocabulary, declare as hierarchical.
+      if ($field_info['field']['module'] == 'taxonomy' && $field_info['field']['type'] == 'taxonomy_term_reference') {
+        $vocabs = $field_info['field']['settings']['allowed_values'];
+        if ((count($vocabs) == 1)) {
+          $vocab = array_shift($vocabs);
+          $vocab = taxonomy_vocabulary_machine_name_load($vocab['vocabulary']);
+          if ($vocab->hierarchy == 1) {
+            $facets[$index_key]['hierarchical'] = TRUE;
+          }
         }
       }
     }