diff --git a/plugins/facetapi/query_type_date.inc b/plugins/facetapi/query_type_date.inc
index ebb26bf..5b5dfe9 100644
--- a/plugins/facetapi/query_type_date.inc
+++ b/plugins/facetapi/query_type_date.inc
@@ -63,9 +63,11 @@ class ApacheSolrFacetapiDate extends FacetapiQueryTypeDate implements FacetapiQu
     $return = NULL;
     $gap = NULL;
 
+    $min_gap = $this->getSettings()->settings['date_granularity'];
+
     // Attempts to get next gap from passed date filters.
     foreach ($this->adapter->getActiveItems($this->facet) as $item) {
-      if ($gap = facetapi_get_date_gap($item['start'], $item['end'])) {
+      if ($gap = facetapi_get_date_gap($item['start'], $item['end'], $min_gap)) {
         $next_gap = facetapi_get_next_date_gap($gap, FACETAPI_DATE_SECOND);
         if ($next_gap == $gap) {
           $next_gap = NULL;
@@ -94,7 +96,7 @@ class ApacheSolrFacetapiDate extends FacetapiQueryTypeDate implements FacetapiQu
       // Gets the default gap.
       //$gap = FACETAPI_DATE_YEAR;
       if ($minimum && $maximum) {
-        $gap = facetapi_get_timestamp_gap($minimum, $maximum);
+        $gap = facetapi_get_timestamp_gap($minimum, $maximum, $min_gap);
         $minimum = facetapi_isodate($minimum, $gap);
         $maximum = facetapi_isodate($maximum, $gap);
         $return = array(