diff --git a/app/components/course-page/course-stage-step/community-solution-card/header-label.hbs b/app/components/course-page/course-stage-step/community-solution-card/header-label.hbs
index 5dcc727899..9a836249c1 100644
--- a/app/components/course-page/course-stage-step/community-solution-card/header-label.hbs
+++ b/app/components/course-page/course-stage-step/community-solution-card/header-label.hbs
@@ -4,6 +4,12 @@
     <span class="text-xs font-semibold leading-5 text-gray-700">Private</span>
     <EmberTooltip @text="This solution is only visible to users within your team." />
   </div>
+{{else if (and (eq @solution.flakinessCheckStatus "failure") (current-user-is-staff))}}
+  <Pill @color="yellow" ...attributes>
+    Flaky
+
+    <EmberTooltip @text="This solution failed tests when run multiple times in a row, so it might not be reliable." />
+  </Pill>
 {{else if @solution.isPinned}}
   <Pill @color="green" ...attributes>
     Editor's choice
diff --git a/app/models/community-course-stage-solution.ts b/app/models/community-course-stage-solution.ts
index 93c7d94a12..c34cc947c1 100644
--- a/app/models/community-course-stage-solution.ts
+++ b/app/models/community-course-stage-solution.ts
@@ -37,6 +37,7 @@ export default class CommunityCourseStageSolutionModel extends Model.extend(View
   @attr('number') declare approvedCommentsCount: number;
   @attr('string') declare explanationMarkdown: string;
   @attr('string') declare commitSha: string;
+  @attr('string') declare flakinessCheckStatus: 'pending' | 'success' | 'failure' | 'error';
   @attr('string') declare githubRepositoryName: string;
   @attr('boolean') declare githubRepositoryIsPrivate: boolean;
   @attr('boolean') declare isPinned: boolean;