diff --git a/src/history/history.service.ts b/src/history/history.service.ts
index 276af8190..cdd35fed4 100644
--- a/src/history/history.service.ts
+++ b/src/history/history.service.ts
@@ -168,7 +168,7 @@ export class HistoryService {
       identifier: entry.note.alias ? entry.note.alias : entry.note.id,
       lastVisited: entry.updatedAt,
       tags: this.notesService.toTagList(entry.note),
-      title: entry.note.title,
+      title: entry.note.title ?? '',
       pinStatus: entry.pinStatus,
     };
   }
diff --git a/src/notes/notes.service.ts b/src/notes/notes.service.ts
index b21dba99c..befa85f81 100644
--- a/src/notes/notes.service.ts
+++ b/src/notes/notes.service.ts
@@ -352,9 +352,9 @@ export class NotesService {
       // TODO: Convert DB UUID to base64
       id: note.id,
       alias: note.alias,
-      title: note.title,
+      title: note.title ?? '',
       createTime: (await this.getFirstRevision(note)).createdAt,
-      description: note.description,
+      description: note.description ?? '',
       editedBy: note.authorColors.map(
         (authorColor) => authorColor.user.userName,
       ),