diff --git a/static/app/views/eventsV2/queryList.tsx b/static/app/views/eventsV2/queryList.tsx
index 8cf48e479f7db7..8de6b4945064fa 100644
--- a/static/app/views/eventsV2/queryList.tsx
+++ b/static/app/views/eventsV2/queryList.tsx
@@ -283,7 +283,11 @@ class QueryList extends React.Component<Props> {
                   eventView={eventView}
                   organization={organization}
                   referrer={referrer}
-                  yAxis={hasFeature ? savedQuery.yAxis : undefined}
+                  yAxis={
+                    hasFeature && savedQuery.yAxis && savedQuery.yAxis.length
+                      ? savedQuery.yAxis
+                      : ['count()']
+                  }
                 />
               )}
             </Feature>