diff --git a/src/Web/StellaOps.Web/src/app/features/policy-studio/services/policy-pack.store.ts b/src/Web/StellaOps.Web/src/app/features/policy-studio/services/policy-pack.store.ts
index bfc838923..a2f2d9816 100644
--- a/src/Web/StellaOps.Web/src/app/features/policy-studio/services/policy-pack.store.ts
+++ b/src/Web/StellaOps.Web/src/app/features/policy-studio/services/policy-pack.store.ts
@@ -74,7 +74,9 @@ export class PolicyPackStore {
       .subscribe((packs) => {
         this.usingFallback = fetchedFromFallback;
         this.packs$.next(packs);
-        this.writeCache(packs);
+        if (!fetchedFromFallback && packs.length > 0) {
+          this.writeCache(packs);
+        }
       });
   }
 
@@ -95,7 +97,8 @@ export class PolicyPackStore {
     try {
       const raw = sessionStorage.getItem(this.cacheKey);
       if (!raw) return null;
-      return JSON.parse(raw) as PolicyPackSummary[];
+      const parsed = JSON.parse(raw) as PolicyPackSummary[];
+      return Array.isArray(parsed) && parsed.length > 0 ? parsed : null;
     } catch {
       return null;
     }