diff --git a/apps/api/src/services/property/property.service.ts b/apps/api/src/services/property/property.service.ts
index 564ea1604d..acfa5822c9 100644
--- a/apps/api/src/services/property/property.service.ts
+++ b/apps/api/src/services/property/property.service.ts
@@ -16,7 +16,7 @@ import { PropertyValue } from './interfaces/interfaces';
 export class PropertyService {
   private static readonly CACHE_TTL = ms('1 minute');
 
-  private cachedProperties: Property[];
+  private cachedProperties: Promise<Property[]>;
   private cachedPropertiesExpiresAt: Date;
 
   public constructor(private readonly prismaService: PrismaService) {}
@@ -88,7 +88,13 @@ export class PropertyService {
       return this.cachedProperties;
     }
 
-    this.cachedProperties = await this.prismaService.property.findMany();
+    this.cachedProperties = this.prismaService.property
+      .findMany()
+      .catch((error) => {
+        this.invalidateCache();
+
+        throw error;
+      });
 
     this.cachedPropertiesExpiresAt = addMilliseconds(
       new Date(),