diff --git a/src/components/testCaseLanding/qdm/TestCaseList.tsx b/src/components/testCaseLanding/qdm/TestCaseList.tsx
index 8d3c85f33..7ddf9bd05 100644
--- a/src/components/testCaseLanding/qdm/TestCaseList.tsx
+++ b/src/components/testCaseLanding/qdm/TestCaseList.tsx
@@ -245,7 +245,7 @@ const TestCaseList = (props: TestCaseListProps) => {
 
   useEffect(() => {
     const validTestCases = testCases?.filter((tc) => tc.validResource);
-    if (validTestCases && calculationOutput) {
+    if (validTestCases && calculationOutput && selectedPopCriteria) {
       const executionResults: CqmExecutionResultsByPatient = calculationOutput;
       // calculation output only contains valid testcases already.
       const highlightingForAllGroups = buildHighlightingForAllGroups(
diff --git a/src/components/testCaseLanding/qiCore/TestCaseList.tsx b/src/components/testCaseLanding/qiCore/TestCaseList.tsx
index c3b0da466..dac288fe7 100644
--- a/src/components/testCaseLanding/qiCore/TestCaseList.tsx
+++ b/src/components/testCaseLanding/qiCore/TestCaseList.tsx
@@ -230,7 +230,7 @@ const TestCaseList = (props: TestCaseListProps) => {
 
   useEffect(() => {
     const validTestCases = testCases?.filter((tc) => tc.validResource);
-    if (validTestCases && calculationOutput?.results) {
+    if (validTestCases && calculationOutput?.results && selectedPopCriteria) {
       // Pull Clause Coverage from coverage HTML
       setCoveragePercentage(
         getCoverageValueFromHtml(