diff --git a/superset/common/query_context_processor.py b/superset/common/query_context_processor.py
index 65cadba84fbd6..6df7df218d268 100644
--- a/superset/common/query_context_processor.py
+++ b/superset/common/query_context_processor.py
@@ -489,7 +489,13 @@ def processing_time_offsets(  # pylint: disable=too-many-locals,too-many-stateme
                 offset_metrics_df = offset_metrics_df.rename(columns=metrics_mapping)
 
                 # 3. set time offset for index
-                index = (get_base_axis_labels(query_object.columns) or [DTTM_ALIAS])[0]
+                index = (
+                    [
+                        *get_base_axis_labels(query_object.columns),
+                        query_object.granularity,
+                    ]
+                    or [DTTM_ALIAS]
+                )[0]
                 if not dataframe_utils.is_datetime_series(offset_metrics_df.get(index)):
                     raise QueryObjectValidationError(
                         _(