diff --git a/src/components/Employee/EmpActivities.jsx b/src/components/Employee/EmpActivities.jsx
index 5af0a162..f5d9e8c2 100644
--- a/src/components/Employee/EmpActivities.jsx
+++ b/src/components/Employee/EmpActivities.jsx
@@ -18,7 +18,7 @@ error,
     refetch,
   } = useProjectTasksByEmployee(employee?.id,dateRange.startDate,dateRange.endDate);
 
- 
+ if(isLoading) return <div>Loading...</div>
   return (
     <>
       <div className="card h-100 mt-4">
@@ -31,7 +31,7 @@ error,
             />
           </div>
           <ul className="timeline mb-0 mt-5 text-start">
-            {data.map((activity)=>(
+            {data?.map((activity)=>(
                <li className="timeline-item timeline-item-transparent">
               <span className="timeline-point timeline-point-primary"></span>
               <div className="timeline-event">