diff --git a/example/src/TimerExample.tsx b/example/src/TimerExample.tsx
index 902397ebf..2efc09ef6 100644
--- a/example/src/TimerExample.tsx
+++ b/example/src/TimerExample.tsx
@@ -29,6 +29,7 @@ const LoadingIndicatorExample: React.FC = () => {
           <Timer
             ref={timerRef}
             initialTime={60000}
+            timerEndTime={70000}
             updateInterval={1000}
             format="mm:ss"
             countDirection={countDirection}
diff --git a/packages/core/src/components/Timer.tsx b/packages/core/src/components/Timer.tsx
index 995860a50..ee119687b 100644
--- a/packages/core/src/components/Timer.tsx
+++ b/packages/core/src/components/Timer.tsx
@@ -15,6 +15,7 @@ interface TimerProps {
   onTimerChange?: (time: number) => void;
   onTimerEnd?: () => void;
   countDirection?: "up" | "down";
+  timerEndTime?: number;
 }
 
 export interface TimerHandle {
@@ -33,6 +34,7 @@ const Timer = forwardRef<TimerHandle, TimerProps>(
       onTimerChange,
       onTimerEnd,
       countDirection = "up",
+      timerEndTime,
     },
     ref
   ) => {
@@ -42,7 +44,8 @@ const Timer = forwardRef<TimerHandle, TimerProps>(
 
     useEffect(() => {
       onTimerChange?.(time);
-    }, [time, onTimerChange]);
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [time]);
 
     useImperativeHandle(ref, () => ({
       start: startTimer,
@@ -58,11 +61,23 @@ const Timer = forwardRef<TimerHandle, TimerProps>(
             countDirection === "up"
               ? prevTime + updateInterval
               : prevTime - updateInterval;
+          // Count down
           if (newTime <= 0 && countDirection === "down") {
             clearTimer();
             onTimerEnd?.();
             return 0;
           }
+          // Count up
+          if (
+            countDirection === "up" &&
+            timerEndTime !== undefined &&
+            newTime >= timerEndTime
+          ) {
+            clearTimer();
+            onTimerEnd?.();
+            return timerEndTime;
+          }
+
           return newTime;
         });
       }, updateInterval);
@@ -84,43 +99,27 @@ const Timer = forwardRef<TimerHandle, TimerProps>(
       }
     };
 
+    useEffect(() => {
+      return () => clearTimer();
+    }, []);
+
     const formatTime = (milliseconds: number): string => {
       const totalSeconds = Math.floor(milliseconds / 1000);
-      const minutes = Math.floor(totalSeconds / 60);
-      const hours = Math.floor(minutes / 60);
-      const seconds = totalSeconds % 60;
+      const hours = Math.floor(totalSeconds / 3600);
+      const minutes = Math.floor((totalSeconds - hours * 3600) / 60);
+      const seconds = totalSeconds - hours * 3600 - minutes * 60;
       const ms = milliseconds % 1000;
 
-      switch (format) {
-        case "hh:mm:ss":
-          return `${String(hours).padStart(2, "0")}:${String(
-            minutes % 60
-          ).padStart(2, "0")}:${String(seconds).padStart(2, "0")}`;
-        case "mm:ss":
-          return `${String(minutes).padStart(2, "0")}:${String(
-            seconds
-          ).padStart(2, "0")}`;
-        case "ss":
-          return `${String(totalSeconds).padStart(2, "0")}`;
-        case "hh:mm:ss:ms":
-          return `${String(hours).padStart(2, "0")}:${String(
-            minutes % 60
-          ).padStart(2, "0")}:${String(seconds).padStart(2, "0")}:${String(
-            ms
-          ).padStart(3, "0")}`;
-        case "mm:ss:ms":
-          return `${String(minutes).padStart(2, "0")}:${String(
-            seconds
-          ).padStart(2, "0")}:${String(ms).padStart(3, "0")}`;
-        case "ss:ms":
-          return `${String(totalSeconds).padStart(2, "0")}:${String(
-            ms
-          ).padStart(3, "0")}`;
-        default:
-          return `${String(minutes).padStart(2, "0")}:${String(
-            seconds
-          ).padStart(2, "0")}`;
-      }
+      const formattedHours = String(hours).padStart(2, "0");
+      const formattedMinutes = String(minutes).padStart(2, "0");
+      const formattedSeconds = String(seconds).padStart(2, "0");
+      const formattedMs = String(ms).padStart(3, "0");
+
+      return format
+        .replace("hh", formattedHours)
+        .replace("mm", formattedMinutes)
+        .replace("ss", formattedSeconds)
+        .replace("ms", formattedMs);
     };
 
     return (