diff --git a/esp/src/src-react/components/Metrics.tsx b/esp/src/src-react/components/Metrics.tsx
index 4f39a3ab2e7..a2fe6f16fd3 100644
--- a/esp/src/src-react/components/Metrics.tsx
+++ b/esp/src/src-react/components/Metrics.tsx
@@ -251,9 +251,12 @@ export const Metrics: React.FunctionComponent<MetricsProps> = ({
     }, [scopesSelectionChanged, scopesTable]);
 
     React.useEffect(() => {
+        if (!scopeFilter || scopeFilter.indexOf("name:") === 0) {
+            setScopeFilter(timelineFilter ? `name:${timelineFilter}` : "");
+        }
         scopesTable
             .metrics(metrics, options, timelineFilter, scopeFilter)
-            .render()
+            .lazyRender()
             ;
     }, [metrics, options, scopeFilter, scopesTable, timelineFilter]);