diff --git a/web/src/hooks/useCountdown.ts b/web/src/hooks/useCountdown.ts
index 85e102566..ca60fa33a 100644
--- a/web/src/hooks/useCountdown.ts
+++ b/web/src/hooks/useCountdown.ts
@@ -1,5 +1,6 @@
 import { useState, useEffect } from "react";
 import { getTimeLeft } from "utils/date";
+import { isUndefined } from "utils/index";
 
 export function useCountdown(deadline?: number): number | undefined {
   const [counter, setCounter] = useState<number | undefined>();
@@ -10,9 +11,10 @@ export function useCountdown(deadline?: number): number | undefined {
     }
   }, [deadline]);
   useEffect(() => {
-    typeof counter !== "undefined" &&
-      counter > 0 &&
-      setTimeout(() => setCounter(counter - 1), 1000);
+    if (!isUndefined(counter) && counter > 0) {
+      const timeout = setTimeout(() => setCounter(counter - 1), 1000);
+      return () => clearTimeout(timeout);
+    } else return;
   }, [counter]);
   return counter;
 }
diff --git a/web/src/pages/Cases/CaseDetails/Timeline.tsx b/web/src/pages/Cases/CaseDetails/Timeline.tsx
index 1712573b6..f25ad94d5 100644
--- a/web/src/pages/Cases/CaseDetails/Timeline.tsx
+++ b/web/src/pages/Cases/CaseDetails/Timeline.tsx
@@ -10,42 +10,23 @@ const Timeline: React.FC<{
   dispute: DisputeDetailsQuery["dispute"];
   currentPeriodIndex: number;
 }> = ({ currentPeriodIndex, dispute }) => {
-  const currentItemIndex = currentPeriodToCurrentItem(
-    currentPeriodIndex,
-    dispute?.ruled
-  );
+  const currentItemIndex = currentPeriodToCurrentItem(currentPeriodIndex, dispute?.ruled);
   const items = useTimeline(dispute, currentItemIndex, currentItemIndex);
   return (
     <TimeLineContainer>
-      <StyledSteps
-        horizontal
-        {...{ items, currentItemIndex, currentPeriodIndex }}
-      />
+      <StyledSteps horizontal {...{ items, currentItemIndex, currentPeriodIndex }} />
     </TimeLineContainer>
   );
 };
 
-const currentPeriodToCurrentItem = (
-  currentPeriodIndex: number,
-  ruled?: boolean
-): number => {
+const currentPeriodToCurrentItem = (currentPeriodIndex: number, ruled?: boolean): number => {
   if (currentPeriodIndex <= Periods.commit) return currentPeriodIndex;
-  else if (currentPeriodIndex < Periods.execution)
-    return currentPeriodIndex - 1;
+  else if (currentPeriodIndex < Periods.execution) return currentPeriodIndex - 1;
   else return ruled ? 5 : currentPeriodIndex - 1;
 };
 
-const useTimeline = (
-  dispute: DisputeDetailsQuery["dispute"],
-  currentItemIndex: number,
-  currentPeriodIndex: number
-) => {
-  const titles = [
-    "Evidence Period",
-    "Voting Period",
-    "Appeal Period",
-    "Executed",
-  ];
+const useTimeline = (dispute: DisputeDetailsQuery["dispute"], currentItemIndex: number, currentPeriodIndex: number) => {
+  const titles = ["Evidence Period", "Voting Period", "Appeal Period", "Executed"];
   const deadlineCurrentPeriod = getDeadline(
     currentPeriodIndex,
     dispute?.lastPeriodChange,
@@ -77,15 +58,9 @@ const getDeadline = (
   lastPeriodChange?: string,
   timesPerPeriod?: string[]
 ): number | undefined => {
-  if (
-    lastPeriodChange &&
-    timesPerPeriod &&
-    currentPeriodIndex < timesPerPeriod.length
-  ) {
+  if (lastPeriodChange && timesPerPeriod && currentPeriodIndex < timesPerPeriod.length) {
     const parsedLastPeriodChange = parseInt(lastPeriodChange, 10);
-    const parsedTimeCurrentPeriod = parseInt(
-      timesPerPeriod[currentPeriodIndex]
-    );
+    const parsedTimeCurrentPeriod = parseInt(timesPerPeriod[currentPeriodIndex]);
     return parsedLastPeriodChange + parsedTimeCurrentPeriod;
   }
   return 0;