diff --git a/app/src/flux/models/model-with-metadata.ts b/app/src/flux/models/model-with-metadata.ts
index 73cf540f7..189b90c7d 100644
--- a/app/src/flux/models/model-with-metadata.ts
+++ b/app/src/flux/models/model-with-metadata.ts
@@ -79,12 +79,15 @@ export class ModelWithMetadata extends Model {
       return null;
     }
     const value = JSON.parse(JSON.stringify(metadata.value));
-    if (value.expiration) {
-      value.expiration = new Date(value.expiration * 1000);
+    if (value === null || value === undefined) {
+      return null;
     }
     if (Object.keys(value).length === 0) {
       return null;
     }
+    if (value.expiration) {
+      value.expiration = new Date(value.expiration * 1000);
+    }
     return value;
   }