diff --git a/frontend/src/pages/NewRunSwitcher.tsx b/frontend/src/pages/NewRunSwitcher.tsx
index fb2e4147a7..d0d11f5082 100644
--- a/frontend/src/pages/NewRunSwitcher.tsx
+++ b/frontend/src/pages/NewRunSwitcher.tsx
@@ -162,7 +162,7 @@ function NewRunSwitcher(props: PageProps) {
     recurringRunIsFetching ||
     pipelineIsFetching ||
     pipelineVersionIsFetching ||
-    v1TemplateStrIsFetching ||
+    (!isTemplateV2(templateString) && v1TemplateStrIsFetching) ||
     experimentIsFetching
   ) {
     return <div>Currently loading pipeline information</div>;