diff --git a/plugins/facetapi/adapter.inc b/plugins/facetapi/adapter.inc
index 3c75b8f..bf9791f 100644
--- a/plugins/facetapi/adapter.inc
+++ b/plugins/facetapi/adapter.inc
@@ -126,6 +126,28 @@ class ApacheSolrFacetapiAdapter extends FacetapiAdapter {
    * Allows for backend specific overrides to the settings form.
    */
   public function settingsForm(&$form_state) {
+
+    if (in_array('date', $form_state['#facetapi']['facet']['query types']) ) {
+      $granularity = array(
+        FACETAPI_DATE_YEAR => t('Year'),
+        FACETAPI_DATE_MONTH => t('Month'),
+        FACETAPI_DATE_DAY => t('Day'),
+        FACETAPI_DATE_HOUR => t('Hour'),
+        FACETAPI_DATE_MINUTE => t('Minute'),
+        FACETAPI_DATE_SECOND => t('Second'),
+      );
+
+      $facet = $form_state['#facetapi']['facet'];
+      $settings = $this->getFacet($facet)->getSettings()->settings;
+
+      $form_state['global']['date_granularity'] = array(
+        '#type' => 'select',
+        '#title' => t('Granularity'),
+        '#description' => t('Determine the date granularity'),
+        '#options' => $granularity,
+        '#default_value' => isset($settings['date_granularity']) ? $settings['date_granularity'] : FACETAPI_DATE_MINUTE,
+      );
+    }
     $form_state['#validate'][] = 'apachesolr_facet_form_validate';
   }
 }
diff --git a/plugins/facetapi/query_type_date.inc b/plugins/facetapi/query_type_date.inc
index c1b3946..ebd3c08 100644
--- a/plugins/facetapi/query_type_date.inc
+++ b/plugins/facetapi/query_type_date.inc
@@ -62,10 +62,13 @@ class ApacheSolrFacetapiDate extends FacetapiQueryTypeDate implements FacetapiQu
   function getDateRange(DrupalSolrQueryInterface $query) {
     $return = NULL;
 
+    $settings = $this->getSettings()->settings;
+    $granularity = isset($settings['date_granularity']) ? $settings['date_granularity'] : FACETAPI_DATE_MINUTE;
+
     // Attempts to get next gap from passed date filters.
     foreach ($this->adapter->getActiveItems($this->facet) as $value => $item) {
       if ($gap = facetapi_get_date_gap($item['start'], $item['end'])) {
-        $next_gap = facetapi_get_next_date_gap($gap, FACETAPI_DATE_SECOND);
+        $next_gap = facetapi_get_next_date_gap($gap, $granularity - 1);
         if ($next_gap == $gap) {
           $next_gap = NULL;
           return;
@@ -154,9 +157,23 @@ class ApacheSolrFacetapiDate extends FacetapiQueryTypeDate implements FacetapiQu
     $start = (!empty($raw_data['start'])) ? $raw_data['start'] : '';
     $gap = (!empty($raw_data['gap'])) ? $raw_data['gap'] : '';
 
+    $settings = $this->getSettings()->settings;
+    $granularity = isset($settings['date_granularity']) ? $settings['date_granularity'] : FACETAPI_DATE_MINUTE;
+
+    $gap_numbers = array(
+      '+1YEAR' => 6,
+      '+1MONTH' => 5,
+      '+1DAY' => 4,
+      '+1HOUR' => 3,
+      '+1MINUTE' => 2,
+      '+1SECOND' => 1,
+    );
+
     // We cannot list anything below a minute (range of 00 seconds till 59
     // seconds. Milliseconds are not possible)
-    if ($gap != "+1SECOND") {
+    //
+    // Also, anything below the set granularity should not be shown either
+    if ($gap != "+1SECOND" && $gap_numbers[$gap] >= $gap_numbers["+1". $granularity]) {
       unset($raw_data['start']);
       unset($raw_data['end']);
       unset($raw_data['gap']);
