diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js
index 13a9d998..76b42c03 100644
--- a/lib/cartodb/models/dataview/histogram.js
+++ b/lib/cartodb/models/dataview/histogram.js
@@ -589,7 +589,7 @@ Histogram.prototype.format = function(result, override) {
         nans = firstRow.nans_count;
         binsStart = populateBinStart(override, firstRow);
 
-        if (timestampStart) {
+        if (Number.isFinite(timestampStart)) {
             aggregation = getAggregation(override, this.aggregation);
             offset = getOffset(override, this.offset);
         }
diff --git a/test/acceptance/dataviews/histogram.js b/test/acceptance/dataviews/histogram.js
index 1e3a2d40..a75cf2b1 100644
--- a/test/acceptance/dataviews/histogram.js
+++ b/test/acceptance/dataviews/histogram.js
@@ -949,11 +949,10 @@ describe('histogram-dates: timestamp starts at epoch', function() {
         this.testClient.getDataview('epoch_start_histogram', override, function(err, dataview) {
             assert.ifError(err);
 
-            console.log(dataview);
             const { aggregation, timestamp_start } = dataview;
 
             assert.equal(timestamp_start, 0);
-            assert.equal(aggregation, 'quarter');
+            assert.equal(aggregation, 'month');
 
             done();
         });