diff --git a/src/shared/components/challenge-detail/Header/index.jsx b/src/shared/components/challenge-detail/Header/index.jsx
index 0a0f0bec75..1ce66d1726 100755
--- a/src/shared/components/challenge-detail/Header/index.jsx
+++ b/src/shared/components/challenge-detail/Header/index.jsx
@@ -98,7 +98,7 @@ export default function ChallengeHeader(props) {
         return false;
       }
       if (phaseLowerCase.includes('registration') || phaseLowerCase.includes('checkpoint') ||
-          phaseLowerCase.includes('submission') || phaseLowerCase.includes('review')) {
+        phaseLowerCase.includes('submission') || phaseLowerCase.includes('review')) {
         return true;
       }
       return false;
@@ -112,7 +112,7 @@ export default function ChallengeHeader(props) {
         return 1;
       }
       return (new Date(a.actualEndTime || a.scheduledEndTime)).getTime() -
-      (new Date(b.actualEndTime || b.scheduledEndTime)).getTime();
+        (new Date(b.actualEndTime || b.scheduledEndTime)).getTime();
     });
 
     if (relevantPhases.length > 1 && appealsEndDate) {
@@ -202,14 +202,20 @@ export default function ChallengeHeader(props) {
           <div styleName="deadlines-view">
             <div styleName="deadlines-overview">
               <div styleName="deadlines-overview-text">
-                <div styleName="next-deadline">
-                  Next Deadline: <span styleName="deadline-highlighted">{nextDeadline || '-'}</span>
-                </div>
-                <div styleName="current-phase">
-                  <span styleName="deadline-highlighted">
-                    {timeLeft}
-                  </span> until current deadline ends
-                </div>
+                {status === 'COMPLETED' ?
+                  <div styleName="completed">The challenge is finished.</div>
+                  :
+                  <div>
+                    <div styleName="next-deadline">
+                      Next Deadline: <span styleName="deadline-highlighted">{nextDeadline || '-'}</span>
+                    </div>
+                    <div styleName="current-phase">
+                      <span styleName="deadline-highlighted">
+                        {timeLeft}
+                      </span> until current deadline ends
+                    </div>
+                  </div>
+                }
               </div>
               <a onClick={props.onToggleDeadlines} styleName="deadlines-collapser">
                 {props.showDeadlineDetail ?
diff --git a/src/shared/components/challenge-detail/Header/style.scss b/src/shared/components/challenge-detail/Header/style.scss
index 51542c7134..2af1f663d4 100644
--- a/src/shared/components/challenge-detail/Header/style.scss
+++ b/src/shared/components/challenge-detail/Header/style.scss
@@ -295,16 +295,20 @@
             word-wrap: normal;
             border-right: $tc-gray-50 solid 1px;
             padding-right: 10px;
+            display: inline;
 
             .deadline-highlighted {
               color: $tc-white;
               font-weight: 700;
             }
           }
-
+          .completed {
+            border-right: none;
+          }
           .current-phase {
             overflow-wrap: normal;
             padding-left: 10px;
+            display: inline;
 
             .deadline-highlighted {
               color: $tc-white;