diff --git a/src/components/Project/Infrastructure/InfraTable.jsx b/src/components/Project/Infrastructure/InfraTable.jsx
index 4b1e863f..2198f957 100644
--- a/src/components/Project/Infrastructure/InfraTable.jsx
+++ b/src/components/Project/Infrastructure/InfraTable.jsx
@@ -108,7 +108,11 @@ const InfraTable = ({ buildings }) => {
     );
   };
   useEffect(() => {
+   if (buildings && buildings.length > 0) {
     setProjectBuilding(buildings);
+    // Automatically expand the first building
+    setExpandedBuildings([buildings[0].id]);
+  }
   }, [buildings]);
 
   return (