diff --git a/src/store/gui/actions.ts b/src/store/gui/actions.ts
index 0f38a267..68740354 100644
--- a/src/store/gui/actions.ts
+++ b/src/store/gui/actions.ts
@@ -12,6 +12,8 @@ export const actions: ActionTree<GuiState, RootState> = {
 
     init({ commit, dispatch, rootState }, payload) {
         window.console.debug('init gui')
+
+        //added in V2.1
         if (
             payload.value.dashboard?.control !== undefined &&
             'useCross' in payload.value.dashboard?.control
@@ -21,6 +23,7 @@ export const actions: ActionTree<GuiState, RootState> = {
             delete payload.value.dashboard?.control.useCross
         }
 
+        //added in V2.1
         if (payload.value.webcam) {
             window.console.debug('convert old webcam')
 
@@ -36,6 +39,7 @@ export const actions: ActionTree<GuiState, RootState> = {
             Vue.$socket.emit('server.database.delete_item', { namespace: 'mainsail', key: 'webcam' })
         }
 
+        //added in V2.1
         if (payload.value.presets) {
             window.console.debug('convert old presets')
 
@@ -43,16 +47,22 @@ export const actions: ActionTree<GuiState, RootState> = {
                 payload.value.presets.forEach((oldPreset: any) => {
                     dispatch('presets/store', { values: oldPreset })
                 })
-            }
 
-            if (payload.value.cooldownGcode) {
-                commit('presets/updateCooldownGcode', payload.value.cooldownGcode)
-                Vue.$socket.emit('server.database.delete_item', { namespace: 'mainsail', key: 'cooldownGcode' })
+                delete payload.value.presets
             }
 
             Vue.$socket.emit('server.database.delete_item', { namespace: 'mainsail', key: 'presets' })
         }
 
+        //added in V2.1
+        if (payload.value.cooldownGcode) {
+            window.console.debug('convert old cooldownGcode')
+
+            dispatch('presets/updateCooldownGcode', payload.value.cooldownGcode)
+            Vue.$socket.emit('server.database.delete_item', { namespace: 'mainsail', key: 'cooldownGcode' })
+            delete payload.value.cooldownGcode
+        }
+
         commit('setData', payload.value)
 
         // init remote printers, when remoteMode is off
diff --git a/src/store/gui/presets/getters.ts b/src/store/gui/presets/getters.ts
index f65aaec1..6891c402 100644
--- a/src/store/gui/presets/getters.ts
+++ b/src/store/gui/presets/getters.ts
@@ -29,7 +29,9 @@ export const getters: GetterTree<GuiPresetsState, any> = {
             value: 0
         })
 
-        Object.values(state.presets).forEach((preset: GuiPresetsStatePreset) => {
+        Object.keys(state.presets).forEach((id: string) => {
+            const preset = state.presets[id]
+
             if (
                 payload.name in preset.values &&
                 preset.values[payload.name].bool &&