diff --git a/src/components/PendingLabel.jsx b/src/components/PendingLabel.jsx
index 920e89a4..42e1a2a5 100644
--- a/src/components/PendingLabel.jsx
+++ b/src/components/PendingLabel.jsx
@@ -14,9 +14,11 @@ const PendingLabel = ({ commentIndex }) => {
   }, []);
 
   if (commentIndex === undefined) return null;
-
+  
   return (
-    commentIndex && stateString !== "Succeeded" ? (
+    comment.cid ? (
+      <span>{comment.cid.slice(2, 14)}</span>
+    ) : (
       (comment.state === "failed" || (stateString === undefined && !isLoading)) ? (
         <span style={{color: 'red', fontWeight: '700'}}>
           Failed
@@ -26,7 +28,7 @@ const PendingLabel = ({ commentIndex }) => {
           Pending
         </span>
       )
-    ) : null
+    )
   );
 };
 
diff --git a/src/components/StateLabel.jsx b/src/components/StateLabel.jsx
index b4c69f0a..98ea0482 100644
--- a/src/components/StateLabel.jsx
+++ b/src/components/StateLabel.jsx
@@ -17,7 +17,7 @@ const StateLabel = ({ commentIndex, className }) => {
 
   return (
     commentIndex && stateString !== "Succeeded" ? (
-      (comment.state === "failed" || (stateString === undefined && !isLoading)) ? (
+      (comment.state === "failed" || (stateString === undefined && !isLoading && comment.cid === undefined)) ? (
         <span className="ttl">
           <br />
           (
diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx
index 9b5712f3..464cf057 100755
--- a/src/components/views/Thread.jsx
+++ b/src/components/views/Thread.jsx
@@ -238,7 +238,7 @@ const Thread = () => {
         setNewSuccessMessage('Challenge Success');
       }
     } else if (challengeVerification.challengeSuccess === false) {
-      setNewErrorMessage('challenge failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
+      setNewErrorMessage('Challenge Failed', {reason: challengeVerification.reason, errors: challengeVerification.errors});
     }
   };