diff --git a/src/components/TeamMemberTasks/FollowupCheckButton.jsx b/src/components/TeamMemberTasks/FollowupCheckButton.jsx
index 0b0022a655..84fab0d605 100644
--- a/src/components/TeamMemberTasks/FollowupCheckButton.jsx
+++ b/src/components/TeamMemberTasks/FollowupCheckButton.jsx
@@ -5,7 +5,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { setUserFollowUp } from '../../actions/followUpActions';
 import styles from './FollowUpCheckButton.module.css';
 
-function FollowupCheckButton({ moseoverText, user, task }) {
+function FollowupCheckButton({ mouseoverText, user, task }) {
   const dispatch = useDispatch();
   const userFollowUps = useSelector(state => state.userFollowUp?.followUps[user.personId] || []);
   const userFollowUpTask = userFollowUps.filter(ele => ele.taskId === task._id);
@@ -14,6 +14,10 @@ function FollowupCheckButton({ moseoverText, user, task }) {
   const [needFollowUp, setNeedFollowUp] = useState(false);
 
   const checkNeedFollowUp = () => {
+    if (isChecked) {
+      setNeedFollowUp(false);
+      return;
+    }
     const taskProgressPercentage =
       Number(((task.hoursLogged / task.estimatedHours) * 100).toFixed(2)) || 0;
 
@@ -54,16 +58,20 @@ function FollowupCheckButton({ moseoverText, user, task }) {
 
   useEffect(() => {
     checkNeedFollowUp();
-  }, [followUpPercentageDeadline]);
+  }, [followUpPercentageDeadline, task.hoursLogged, task.estimatedHours, isChecked]);
 
   const handleCheckboxFollowUp = () => {
-    const progressPersantage =
-      Number(((task.hoursLogged / task.estimatedHours) * 100).toFixed(2)) || 0;
+    const hoursLogged = Number(task.hoursLogged) || 0;
+    const estimatedHours = Number(task.estimatedHours) || 0;
+
+    const progressPercentage =
+      estimatedHours > 0 ? Number(((hoursLogged / estimatedHours) * 100).toFixed(2)) : 0;
 
     const data = {
-      followUpCheck: needFollowUp ? true : !isChecked,
-      followUpPercentageDeadline: progressPersantage,
+      followUpCheck: Boolean(!isChecked),
+      followUpPercentageDeadline: progressPercentage,
     };
+
     dispatch(setUserFollowUp(user.personId, task._id, data));
   };
 
@@ -71,7 +79,7 @@ function FollowupCheckButton({ moseoverText, user, task }) {
     <div className={styles['followup-box']}>
       <input
         type="checkbox"
-        title={moseoverText}
+        title={mouseoverText}
         className={`${styles['team-task-progress-follow-up']} ${
           needFollowUp ? styles['team-task-progress-follow-up-red'] : ''
         }`}
diff --git a/src/components/TeamMemberTasks/TeamMemberTask.jsx b/src/components/TeamMemberTasks/TeamMemberTask.jsx
index 106b89991b..f09dde7a5f 100644
--- a/src/components/TeamMemberTasks/TeamMemberTask.jsx
+++ b/src/components/TeamMemberTasks/TeamMemberTask.jsx
@@ -654,7 +654,7 @@ const TeamMemberTask = React.memo(
                                           {canSeeFollowUpCheckButton && (
                                             <div className={styles['task-followup-icon']}>
                                               <FollowupCheckButton
-                                                moseoverText={followUpMouseoverText(task)}
+                                                mouseoverText={followUpMouseoverText(task)}
                                                 user={user}
                                                 task={task}
                                               />