diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index b7204fed9e6d5..a64a62869f701 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -1150,6 +1150,8 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
                 col = self.adhoc_metric_to_sqla(col, columns_by_name)
             elif col in columns_by_name:
                 col = columns_by_name[col].get_sqla_col()
+            elif col in metrics_by_name:
+                col = metrics_by_name[col].get_sqla_col()
 
             if isinstance(col, Label):
                 label = col._label  # pylint: disable=protected-access
diff --git a/superset/examples/birth_names.py b/superset/examples/birth_names.py
index a8729940dcdb0..583a0991f3655 100644
--- a/superset/examples/birth_names.py
+++ b/superset/examples/birth_names.py
@@ -271,8 +271,8 @@ def create_slices(
                 groupby=["name"],
                 adhoc_filters=[gen_filter("gender", "girl")],
                 row_limit=50,
-                timeseries_limit_metric="sum__num",
-                metrics=metrics,
+                timeseries_limit_metric=metric,
+                metrics=[metric],
             ),
         ),
         Slice(
@@ -300,7 +300,8 @@ def create_slices(
                 groupby=["name"],
                 adhoc_filters=[gen_filter("gender", "boy")],
                 row_limit=50,
-                metrics=metrics,
+                timeseries_limit_metric=metric,
+                metrics=[metric],
             ),
         ),
         Slice(