diff --git a/src/app/(modules)/dashboard/page.tsx b/src/app/(modules)/dashboard/page.tsx
index 886e999..7bac140 100644
--- a/src/app/(modules)/dashboard/page.tsx
+++ b/src/app/(modules)/dashboard/page.tsx
@@ -276,6 +276,7 @@ export default function DashboardPage() {
       setProjectSummary(null);
       return;
     }
+    setProjectSummary(null);
 
     const loadProjectSummary = async () => {
       try {
@@ -360,9 +361,11 @@ export default function DashboardPage() {
         : projectSummary.packages || {};
 
     for (const [pkgName, pkg] of Object.entries(packagesToProcess)) {
+      if (!pkg) continue;
+
       const chainagesToProcess =
         selectedChainageId && selectedChainageId !== 'all'
-          ? { [selectedChainageId]: pkg.chainages[selectedChainageId] }
+          ? { [selectedChainageId]: pkg.chainages?.[selectedChainageId] }
           : pkg.chainages || {};
 
       for (const [chnName, chn] of Object.entries(chainagesToProcess)) {
diff --git a/src/components/dashboard/dashboard-map.tsx b/src/components/dashboard/dashboard-map.tsx
index 5d589ee..7898721 100644
--- a/src/components/dashboard/dashboard-map.tsx
+++ b/src/components/dashboard/dashboard-map.tsx
@@ -58,9 +58,11 @@ export function DashboardMap({
           : projectSummary.packages || {};
 
       for (const [pkgName, pkg] of Object.entries(packagesToProcess)) {
+        if (!pkg) continue;
+        
         const chainagesToProcess =
           selectedChainageId && selectedChainageId !== 'all'
-            ? { [selectedChainageId]: (pkg as any).chainages[selectedChainageId] }
+            ? { [selectedChainageId]: (pkg as any).chainages?.[selectedChainageId] }
             : (pkg as any).chainages || {};
 
         for (const [chnName, chn] of Object.entries(chainagesToProcess)) {