diff --git a/client/src/common/components/countdown/Countdown.jsx b/client/src/common/components/countdown/Countdown.jsx
index f4a692025..01805306a 100644
--- a/client/src/common/components/countdown/Countdown.jsx
+++ b/client/src/common/components/countdown/Countdown.jsx
@@ -11,7 +11,7 @@ function display(seconds) {
 export default function Countdown({ time, small }) {
   return (
     <div className={small ? styles.countdownClockSmall : styles.countdownClock}>
-      {time === null ? '-- : -- : --' : display(time)}
+      {(time === null || isNaN(time)) ? '-- : -- : --' : display(time)}
     </div>
   );
 }
diff --git a/client/src/common/dateConfig.js b/client/src/common/dateConfig.js
index a3ccbe28a..6ee455724 100644
--- a/client/src/common/dateConfig.js
+++ b/client/src/common/dateConfig.js
@@ -1,4 +1,5 @@
 export const timeFormat = 'HH:mm';
+export const timeFormatSeconds = 'HH:mm:ss';
 
  // make date with string
 export const timeToDate = (time) => {