diff --git a/src/shared/components/challenge-detail/Checkpoints/index.jsx b/src/shared/components/challenge-detail/Checkpoints/index.jsx
index 71c2d97388..7ec9bebe0e 100644
--- a/src/shared/components/challenge-detail/Checkpoints/index.jsx
+++ b/src/shared/components/challenge-detail/Checkpoints/index.jsx
@@ -97,7 +97,7 @@ export default class Checkpoints extends React.Component {
                 {
                   this.state[`${item.submissionId}_exp`] &&
                   <p styleName="challenge-checkpoint-feedback">
-                    {decodeEscaped(item.feedback)}
+                    {item.feedback ? decodeEscaped(item.feedback) : <span styleName="empty">Empty Feedback</span>}
                   </p>
                 }
               </div>
diff --git a/src/shared/components/challenge-detail/Checkpoints/styles.scss b/src/shared/components/challenge-detail/Checkpoints/styles.scss
index 9d61bc5ce3..208149e663 100644
--- a/src/shared/components/challenge-detail/Checkpoints/styles.scss
+++ b/src/shared/components/challenge-detail/Checkpoints/styles.scss
@@ -97,6 +97,10 @@ $tc-gray-border: #aaaab5;
         color: $tc-gray-90;
         line-height: 25px;
         padding: 15px 15px 25px;
+
+        .empty {
+          color: $tc-gray-40;
+        }
       }
     }
   }