diff --git a/src/components/Project/Infrastructure/WorkArea.jsx b/src/components/Project/Infrastructure/WorkArea.jsx
index 7389f547..c0d9ec7b 100644
--- a/src/components/Project/Infrastructure/WorkArea.jsx
+++ b/src/components/Project/Infrastructure/WorkArea.jsx
@@ -122,9 +122,11 @@ const WorkArea = ({ workArea, floor, forBuilding }) => {
                 aria-labelledby={`heading-${workArea.id}`}
               >
                 <div className="accordion-body px-1">
-                  {isLoading ? (
+                  {isLoading  || ProjectTaskList === undefined  ? (
                     <div className="text-center py-2 text-muted">Loading activities...</div>
-                  ) : ProjectTaskList?.length > 0 ? (
+                  ) :  ProjectTaskList?.length ===  0 ? (
+                    <div className="text-center py-2 text-muted">Loading activities...</div>
+                  ):ProjectTaskList?.length > 0 ? (
                     <table className="table table-sm mx-1">
                       <thead>
                         <tr>