diff --git a/web/packages/new/photos/services/ml/db.ts b/web/packages/new/photos/services/ml/db.ts
index 14bd0a58f9..6ae98519c3 100644
--- a/web/packages/new/photos/services/ml/db.ts
+++ b/web/packages/new/photos/services/ml/db.ts
@@ -109,11 +109,7 @@ const openMLDB = async () => {
             }
             // TODO-Cluster
             if (oldVersion < 3) {
-                if (
-                    newVersion &&
-                    newVersion > 10 &&
-                    process.env.NEXT_PUBLIC_ENTE_WIP_CL
-                ) {
+                if (process.env.NEXT_PUBLIC_ENTE_WIP_CL) {
                     db.createObjectStore("face-cluster", { keyPath: "id" });
                     db.createObjectStore("person", { keyPath: "id" });
                 }
diff --git a/web/packages/new/photos/services/user-entity.ts b/web/packages/new/photos/services/user-entity.ts
index db276a7054..fb8330beb2 100644
--- a/web/packages/new/photos/services/user-entity.ts
+++ b/web/packages/new/photos/services/user-entity.ts
@@ -76,10 +76,18 @@ interface UserEntity {
 
 const RemoteUserEntity = z.object({
     id: z.string(),
-    /** Base64 string containing the encrypted contents of the entity. */
-    encryptedData: z.string(),
-    /** Base64 string containing the decryption header. */
-    header: z.string(),
+    /**
+     * Base64 string containing the encrypted contents of the entity.
+     *
+     * Will be `null` when isDeleted is true.
+     */
+    encryptedData: z.string().nullable(),
+    /**
+     * Base64 string containing the decryption header.
+     *
+     * Will be `null` when isDeleted is true.
+     */
+    header: z.string().nullable(),
     isDeleted: z.boolean(),
     updatedAt: z.number(),
 });