diff --git a/src/components/Project/Infrastructure/TaskModel.jsx b/src/components/Project/Infrastructure/TaskModel.jsx
index 6282d383..d6f7fbce 100644
--- a/src/components/Project/Infrastructure/TaskModel.jsx
+++ b/src/components/Project/Infrastructure/TaskModel.jsx
@@ -2,9 +2,7 @@ import React, { useState, useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
-import { useDispatch } from "react-redux";
-import { changeMaster } from "../../../slices/localVariablesSlice";
-import useMaster from "../../../hooks/masterHook/useMaster";
+import  {useActivitiesMaster} from "../../../hooks/masterHook/useMaster";
 
 const taskSchema = z.object({
   buildingID: z.string().min(1, "Building is required"),
@@ -32,15 +30,16 @@ const TaskModel = ({
   onClearComplete,
   onClose,
 }) => {
-  const dispatch = useDispatch();
-  const { data: activities } = useMaster();
   const [formData, setFormData] = useState(defaultModel);
   const [selectedBuilding, setSelectedBuilding] = useState(null);
   const [selectedFloor, setSelectedFloor] = useState(null);
   const [selectedWorkArea, setSelectedWorkArea] = useState(null);
   const [selectedActivity, setSelectedActivity] = useState(null);
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const [activityData, setActivityData] = useState([]);
+  const [ activityData, setActivityData ] = useState( [] );
+  const {activities, loading, error} = useActivitiesMaster();
+ 
+
 
   const {
     register,
@@ -54,7 +53,6 @@ const TaskModel = ({
   });
 
   useEffect(() => {
-    dispatch(changeMaster("Activity"));
     resetForm();
   }, []);
 
@@ -124,11 +122,14 @@ const TaskModel = ({
     reset(defaultModel);
   };
 
-  useEffect(() => {
-    if (activities && activities.length > 0) {
-      setActivityData( activities );
-    }
-  }, [activities]);
+  
+useEffect(() => {
+  if (!loading && Array.isArray(activities) && activities.length > 0) {
+   
+    setActivityData(activities);
+  }
+}, [activities, loading]);
+
   return (
     <div className="modal-dialog modal-lg modal-simple modal-edit-user">
       <div className="modal-content">
@@ -274,7 +275,7 @@ const TaskModel = ({
                           </option>
                         ))
                     ) : (
-                      <option disabled>No activities available</option> // Fallback if activities are empty
+                      <option disabled>No activities available</option> 
                     )}
                   </select>
 
@@ -284,7 +285,6 @@ const TaskModel = ({
                 </div>
               )}
 
-              {/* Planned Work */}
               {selectedActivity && (
                 <div className="col-5 col-md-5">
                   <label className="form-label" htmlFor="plannedWork">
@@ -302,7 +302,6 @@ const TaskModel = ({
                 </div>
               )}
 
-              {/* Completed Work */}
               {selectedActivity && (
                 <div className="col-5 col-md-5">
                   <label className="form-label" htmlFor="completedWork">
diff --git a/src/hooks/masterHook/useMaster.js b/src/hooks/masterHook/useMaster.js
index 089f5678..b3588181 100644
--- a/src/hooks/masterHook/useMaster.js
+++ b/src/hooks/masterHook/useMaster.js
@@ -16,7 +16,7 @@ export const useMasterRole = () =>
   useMasterData("masterRole", MasterRespository.getRoles);
 
 
-const useMaster = () => {
+const useMaster = (isMa) => {
 
   const selectedMaster = useSelector((store)=>store.localVariables.selectedMaster);
   const [data, setData] = useState([]);
@@ -78,9 +78,44 @@ const useMaster = () => {
 
   return { data, loading, error }
 };
-
-
-
-
 export default useMaster;
 
+
+
+export const useActivitiesMaster = () =>
+{
+  const [ activities, setActivites ] = useState( [] )
+  const [ loading, setloading ] = useState( false );
+  const [ error, setError ] = useState( "" )
+
+    const fetchActivities =async () =>  {
+      const cacheddata = getCachedData("ActivityMaster");
+
+      if (!cacheddata) {
+        setloading(true);
+        try {
+          const response = await MasterRespository.getActivites();
+          setActivites(response.data);
+          cacheData("ActivityMaster", response.data);
+        } catch (err) {
+          setError(err);
+          console.log(err);
+        } finally {
+          setloading(false);
+        }
+      } else {
+        setActivites(cacheddata);
+      }
+     }
+  useEffect( () =>
+  {
+    fetchActivities()
+  }, [] )
+  
+  return {activities,loading,error}
+}
+
+
+
+
+