diff --git a/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/course.tsx b/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/course.tsx
index dce108e1..c4d70d1d 100644
--- a/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/course.tsx
+++ b/apps/web/app/orgs/[orgslug]/(withmenu)/course/[courseuuid]/course.tsx
@@ -114,9 +114,13 @@ const CourseClient = (props: any) => {
   }
 
   const isActivityDone = (activity: any) => {
-    const run = course?.trail?.runs?.find(
-      (run: any) => run.course_id == course.id
-    )
+    const cleanCourseUuid = course.course_uuid?.replace('course_', '');
+    const run = trailData?.runs?.find(
+      (run: any) => {
+        const cleanRunCourseUuid = run.course?.course_uuid?.replace('course_', '');
+        return cleanRunCourseUuid === cleanCourseUuid;
+      }
+    );
     if (run) {
       return run.steps.find((step: any) => step.activity_id == activity.id)
     }
@@ -171,7 +175,16 @@ const CourseClient = (props: any) => {
                   ></div>
                 )}
 
-                {course?.trail?.runs?.find((run: any) => run.course_id == course.id) && (
+                {(() => {
+                  const cleanCourseUuid = course.course_uuid?.replace('course_', '');
+                  const run = trailData?.runs?.find(
+                    (run: any) => {
+                      const cleanRunCourseUuid = run.course?.course_uuid?.replace('course_', '');
+                      return cleanRunCourseUuid === cleanCourseUuid;
+                    }
+                  );
+                  return run;
+                })() && (
                   <ActivityIndicators
                     course_uuid={props.course.course_uuid}
                     orgslug={orgslug}
diff --git a/apps/web/components/Objects/Courses/CourseActions/CoursesActions.tsx b/apps/web/components/Objects/Courses/CourseActions/CoursesActions.tsx
index 3839e756..776ee296 100644
--- a/apps/web/components/Objects/Courses/CourseActions/CoursesActions.tsx
+++ b/apps/web/components/Objects/Courses/CourseActions/CoursesActions.tsx
@@ -488,6 +488,7 @@ function CoursesActions({ courseuuid, orgslug, course, trailData }: CourseAction
           orgslug={orgslug}
           isOpen={isProgressOpen}
           onClose={() => setIsProgressOpen(false)}
+          trailData={trailData}
         />
       </div>
     </div>
diff --git a/apps/web/components/Objects/Courses/CourseProgress/CourseProgress.tsx b/apps/web/components/Objects/Courses/CourseProgress/CourseProgress.tsx
index 4b697d18..e4e9a17a 100644
--- a/apps/web/components/Objects/Courses/CourseProgress/CourseProgress.tsx
+++ b/apps/web/components/Objects/Courses/CourseProgress/CourseProgress.tsx
@@ -9,9 +9,10 @@ interface CourseProgressProps {
   orgslug: string
   isOpen: boolean
   onClose: () => void
+  trailData: any
 }
 
-const CourseProgress: React.FC<CourseProgressProps> = ({ course, orgslug, isOpen, onClose }) => {
+const CourseProgress: React.FC<CourseProgressProps> = ({ course, orgslug, isOpen, onClose, trailData }) => {
   const [completedActivities, setCompletedActivities] = useState(0)
   const [totalActivities, setTotalActivities] = useState(0)
 
@@ -33,9 +34,13 @@ const CourseProgress: React.FC<CourseProgressProps> = ({ course, orgslug, isOpen
   }, [course])
 
   const isActivityDone = (activity: any) => {
-    const run = course?.trail?.runs?.find(
-      (run: any) => run.course_id === course.id
-    )
+    const cleanCourseUuid = course.course_uuid?.replace('course_', '');
+    const run = trailData?.runs?.find(
+      (run: any) => {
+        const cleanRunCourseUuid = run.course?.course_uuid?.replace('course_', '');
+        return cleanRunCourseUuid === cleanCourseUuid;
+      }
+    );
     if (run) {
       return run.steps.find((step: any) => step.activity_id === activity.id)
     }