diff --git a/packages/analytics/src/models/sessions.js b/packages/analytics/src/models/sessions.js
index 9b429a8..39988c7 100644
--- a/packages/analytics/src/models/sessions.js
+++ b/packages/analytics/src/models/sessions.js
@@ -57,10 +57,10 @@ export async function sessionList() {
         user: user.username,
         quest,
         status,
-        createdAt: createdAt.toLocaleString(),
+        createdAt: createdAt?.toLocaleString(),
         finishedAt: finishedAt?.toLocaleString(),
         usedTime: finishedAt ? formatTime(finishedAt - createdAt) : '',
-        commandCount: commands.length,
+        commandCount: commands?.length,
       }
     }
   )
diff --git a/packages/analytics/src/models/users.js b/packages/analytics/src/models/users.js
index 9d1a545..0f7b81f 100644
--- a/packages/analytics/src/models/users.js
+++ b/packages/analytics/src/models/users.js
@@ -38,10 +38,10 @@ export async function userList() {
     return {
       username,
       email,
-      createdAt: createdAt.toLocaleString(),
+      createdAt: createdAt?.toLocaleString(),
       method: loginMethods(userData),
       sessionCount: count,
-      lastActivityAt: lastActivityAt.toLocaleString(),
+      lastActivityAt: lastActivityAt?.toLocaleString(),
     }
   })
 }