diff --git a/src/stores/constraints.ts b/src/stores/constraints.ts
index 66a2216e2e..98adce737c 100644
--- a/src/stores/constraints.ts
+++ b/src/stores/constraints.ts
@@ -234,14 +234,11 @@ export const relevantConstraintRuns: Readable<ConstraintRun[]> = derived(
 );
 
 export const visibleConstraintResults: Readable<ConstraintResultWithName[]> = derived(
-  [constraintResponses, allowedConstraintPlanSpecMap],
-  ([$constraintResponses, $allowedConstraintPlanSpecMap]) => {
+  [constraintResponses, constraintVisibilityMap],
+  ([$constraintResponses, $constraintVisibilityMap]) => {
     return $constraintResponses
       .filter(constraintResponse => {
-        return (
-          $allowedConstraintPlanSpecMap[constraintResponse.constraintId][constraintResponse.constraintInvocationId] !=
-          null
-        );
+        return $constraintVisibilityMap[constraintResponse.constraintId]?.[constraintResponse.constraintInvocationId];
       })
       .map(constraintResponse => {
         return {