diff --git a/src/store/gui/maintenance/actions.ts b/src/store/gui/maintenance/actions.ts
index 1f3530dff..ce11620b6 100644
--- a/src/store/gui/maintenance/actions.ts
+++ b/src/store/gui/maintenance/actions.ts
@@ -157,7 +157,7 @@ export const actions: ActionTree
= {
entry.end_time = Date.now() / 1000
entry.end_filament = totalFilament
entry.end_printtime = totalPrintTime
- entry.perform_note = payload.note.trim() || null
+ entry.perform_note = payload.note?.trim() || null
dispatch('update', entry)
diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts
index 51ba0beb2..ad4398f63 100644
--- a/src/store/printer/getters.ts
+++ b/src/store/printer/getters.ts
@@ -166,7 +166,7 @@ export const getters: GetterTree = {
// remove macros with rename_existing in the config
const propLower = prop.toLowerCase()
- const propSettings = settings[propLower] ?? {}
+ const propSettings = settings != undefined ? settings[propLower] ?? {} : {}
if ('rename_existing' in propSettings) return
array.push({