diff --git a/packages/firebase/src/utils.ts b/packages/firebase/src/utils.ts
index 8dbcbea8..3546d9cc 100644
--- a/packages/firebase/src/utils.ts
+++ b/packages/firebase/src/utils.ts
@@ -11,8 +11,8 @@ export function docSnapshotToObject<T>(
     return null
   }
   const data: any = snapshot.data()
-  if (data.expires) {
-    data.expires = data.expires.toDate()
+  if (data?.expires) {
+    data.expires = data?.expires?.toDate()
   }
   return { id: snapshot.id, ...data }
 }
@@ -26,8 +26,8 @@ export function querySnapshotToObject<T>(
   const doc = snapshot.docs[0]
 
   const data: any = doc.data()
-  if (data.expires) {
-    data.expires = data.expires.toDate()
+  if (data?.expires) {
+    data.expires = data?.expires?.toDate()
   }
   return { id: doc.id, ...data }
 }