diff --git a/superset/models.py b/superset/models.py
index a9d6ff4b71ab..aefdfe617361 100644
--- a/superset/models.py
+++ b/superset/models.py
@@ -2399,7 +2399,7 @@ def recursive_get_fields(_conf):
         if len(groupby) == 0:
             del qry['dimensions']
             client.timeseries(**qry)
-        if len(groupby) == 1:
+        if not having_filters and len(groupby) == 1:
             qry['threshold'] = timeseries_limit or 1000
             if row_limit and granularity == 'all':
                 qry['threshold'] = row_limit