diff --git a/client/src/services/circle.ts b/client/src/services/circle.ts
index 1c3b6424..2c87a5da 100644
--- a/client/src/services/circle.ts
+++ b/client/src/services/circle.ts
@@ -209,7 +209,7 @@ export class Circle implements WagtailCircle {
         learningContents.every((lc) => lc.completion_status === "success") &&
         (groupedPerformanceCriteria.length === 0 ||
           groupedPerformanceCriteria.every((group) =>
-            group.some(
+            group.every(
               (pc) =>
                 pc.completion_status === "success" || pc.completion_status === "fail"
             )
diff --git a/client/src/stores/circle.ts b/client/src/stores/circle.ts
index 5e5c1487..90436dfb 100644
--- a/client/src/stores/circle.ts
+++ b/client/src/stores/circle.ts
@@ -135,7 +135,11 @@ export const useCircleStore = defineStore({
         if (learningUnit.children.every((q) => q.completion_status === "success")) {
           return "success";
         }
-        if (learningUnit.children.some((q) => q.completion_status === "fail")) {
+        if (
+          learningUnit.children.every(
+            (q) => q.completion_status === "fail" || q.completion_status === "success"
+          )
+        ) {
           return "fail";
         }
       }