diff --git a/libs/tools/generator/extensions/history/src/key-definitions.ts b/libs/tools/generator/extensions/history/src/key-definitions.ts
index d75461bc328..416f13f7bee 100644
--- a/libs/tools/generator/extensions/history/src/key-definitions.ts
+++ b/libs/tools/generator/extensions/history/src/key-definitions.ts
@@ -15,7 +15,7 @@ export const GENERATOR_HISTORY = SecretKeyDefinition.array(
   "localGeneratorHistory",
   SecretClassifier.allSecret<GeneratedCredential>(),
   {
-    deserializer: (obj) => GeneratedCredential.fromJSON(obj!),
+    deserializer: (obj) => obj && GeneratedCredential.fromJSON(obj),
     clearOn: ["logout"],
   },
 );