diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index c0c7c5dc7..1881e680f 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -967,7 +967,7 @@ class SqlaTable(  # pylint: disable=too-many-public-methods,too-many-instance-at
         columns = columns or []
         columns = [col for col in columns if col != utils.DTTM_ALIAS]
 
-        if (is_sip_38 and metrics and columns) or (not is_sip_38 and metrics):
+        if metrics or groupby:
             # dedup columns while preserving order
             columns = columns if is_sip_38 else (groupby or columns)
             select_exprs = []