diff --git a/src/components/Project/Infrastructure/EditActivityModal.jsx b/src/components/Project/Infrastructure/EditActivityModal.jsx
index cf91a37f..e20abe0d 100644
--- a/src/components/Project/Infrastructure/EditActivityModal.jsx
+++ b/src/components/Project/Infrastructure/EditActivityModal.jsx
@@ -85,7 +85,7 @@ useEffect(() => {
 
   reset({
     activityID: String(
-      workItem?.workItem?.activityId || workItem?.activityId || ""
+      workItem?.workItem?.activityId || workItem?.activityId
     ),
     workCategoryId: String(
       workItem?.workItem?.workCategoryId || workItem?.workCategoryId || ""
@@ -96,7 +96,7 @@ useEffect(() => {
       workItem?.workItem?.completedWork || workItem?.completedWork || 0,
     comment: workItem?.workItem?.description || workItem?.description || "",
   });
-}, [workItem?.id]);
+}, [workItem?.id,selectedActivity]);
 
 
   useEffect(() => {