diff --git a/src/components/layout/AppBar.vue b/src/components/layout/AppBar.vue
index 5f4e4c898f..62b8c7585a 100644
--- a/src/components/layout/AppBar.vue
+++ b/src/components/layout/AppBar.vue
@@ -242,7 +242,7 @@ import UserPasswordDialog from '@/components/settings/auth/UserPasswordDialog.vu
 import PendingChangesDialog from '@/components/settings/PendingChangesDialog.vue'
 import AppSaveConfigAndRestartBtn from './AppSaveConfigAndRestartBtn.vue'
 import AppUploadAndPrintBtn from './AppUploadAndPrintBtn.vue'
-import { defaultState } from '@/store/layout/state'
+import { createState } from '@/store/layout/state'
 import StateMixin from '@/mixins/state'
 import ServicesMixin from '@/mixins/services'
 import FilesMixin from '@/mixins/files'
@@ -404,7 +404,7 @@ export default class AppBar extends Mixins(StateMixin, ServicesMixin, FilesMixin
       ? this.$route.name
       : undefined
     const layoutDefaultState = pathLayout
-      ? defaultState().layouts[pathLayout]
+      ? createState().layouts[pathLayout]
       : this.$typedGetters['layout/getLayout']('dashboard')!
 
     const toReset = pathLayout ?? this.$typedGetters['layout/getSpecificLayoutName']
@@ -437,7 +437,7 @@ export default class AppBar extends Mixins(StateMixin, ServicesMixin, FilesMixin
   handleResetDefaultLayout () {
     this.$typedDispatch('layout/onLayoutChange', {
       name: 'dashboard',
-      value: defaultState().layouts.dashboard
+      value: createState().layouts.dashboard
     })
   }
 
diff --git a/src/components/settings/FileEditorSettings.vue b/src/components/settings/FileEditorSettings.vue
index 5d0cac6005..ab7c777985 100644
--- a/src/components/settings/FileEditorSettings.vue
+++ b/src/components/settings/FileEditorSettings.vue
@@ -85,7 +85,7 @@
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
-import { defaultState } from '@/store/config/state'
+import { createState } from '@/store/config/state'
 import type { KlipperSaveAndRestartAction, RestoreViewState } from '@/store/config/types'
 
 @Component({})
@@ -195,7 +195,7 @@ export default class FileEditorSettings extends Mixins(StateMixin) {
   handleReset () {
     this.$typedDispatch('config/saveByPath', {
       path: 'uiSettings.editor',
-      value: defaultState().uiSettings.editor,
+      value: createState().uiSettings.editor,
       server: true
     })
   }
diff --git a/src/components/settings/GcodePreviewSettings.vue b/src/components/settings/GcodePreviewSettings.vue
index 23fcbb2278..31ec6bcb64 100644
--- a/src/components/settings/GcodePreviewSettings.vue
+++ b/src/components/settings/GcodePreviewSettings.vue
@@ -196,7 +196,7 @@
 
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator'
-import { defaultState } from '@/store/config/state'
+import { createState } from '@/store/config/state'
 
 @Component({
   components: {}
@@ -365,7 +365,7 @@ export default class GcodePreviewSettings extends Vue {
   handleReset () {
     this.$typedDispatch('config/saveByPath', {
       path: 'uiSettings.gcodePreview',
-      value: defaultState().uiSettings.gcodePreview,
+      value: createState().uiSettings.gcodePreview,
       server: true
     })
   }
diff --git a/src/components/settings/MmuSettings.vue b/src/components/settings/MmuSettings.vue
index b21e66b903..8d0dd6e4f9 100644
--- a/src/components/settings/MmuSettings.vue
+++ b/src/components/settings/MmuSettings.vue
@@ -110,7 +110,7 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import MmuMixin from '@/mixins/mmu'
-import { defaultState } from '@/store/config/state'
+import { createState } from '@/store/config/state'
 
 @Component({
   components: {}
@@ -215,7 +215,7 @@ export default class MmuSettings extends Mixins(StateMixin, MmuMixin) {
   handleReset () {
     this.$typedDispatch('config/saveByPath', {
       path: 'uiSettings.mmu',
-      value: defaultState().uiSettings.mmu,
+      value: createState().uiSettings.mmu,
       server: true
     })
   }
diff --git a/src/components/settings/SpoolmanSettings.vue b/src/components/settings/SpoolmanSettings.vue
index 11dddcc90d..fe128e304c 100644
--- a/src/components/settings/SpoolmanSettings.vue
+++ b/src/components/settings/SpoolmanSettings.vue
@@ -127,7 +127,7 @@
 
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
-import { defaultState } from '@/store/config/state'
+import { createState } from '@/store/config/state'
 import StateMixin from '@/mixins/state'
 import type { SpoolmanRemainingFilamentUnit } from '@/store/config/types'
 
@@ -281,7 +281,7 @@ export default class SpoolmanSettings extends Mixins(StateMixin) {
   handleReset () {
     this.$typedDispatch('config/saveByPath', {
       path: 'uiSettings.spoolman',
-      value: defaultState().uiSettings.spoolman,
+      value: createState().uiSettings.spoolman,
       server: true
     })
   }
diff --git a/src/components/settings/ToolheadSettings.vue b/src/components/settings/ToolheadSettings.vue
index b9f395273e..77396ed975 100644
--- a/src/components/settings/ToolheadSettings.vue
+++ b/src/components/settings/ToolheadSettings.vue
@@ -392,7 +392,7 @@
 
 <script lang="ts">
 import { Component, Ref, Mixins } from 'vue-property-decorator'
-import { defaultState } from '@/store/config/state'
+import { createState } from '@/store/config/state'
 import type { VCombobox } from 'vuetify/lib'
 import ToolheadMixin from '@/mixins/toolhead'
 import type { GeneralConfig, ToolheadControlStyle } from '@/store/config/types'
@@ -729,7 +729,7 @@ export default class ToolHeadSettings extends Mixins(ToolheadMixin) {
     const { instanceName, chartVisible, chartSmoothingWindow, hideTempWaits }: GeneralConfig = this.$typedState.config.uiSettings.general
 
     const value: GeneralConfig = {
-      ...defaultState().uiSettings.general,
+      ...createState().uiSettings.general,
       instanceName,
       chartVisible,
       chartSmoothingWindow,
diff --git a/src/components/settings/WarningsSettings.vue b/src/components/settings/WarningsSettings.vue
index feb07054f4..5a2f5aea3e 100644
--- a/src/components/settings/WarningsSettings.vue
+++ b/src/components/settings/WarningsSettings.vue
@@ -50,7 +50,7 @@
 
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator'
-import { defaultState } from '@/store/config/state'
+import { createState } from '@/store/config/state'
 
 @Component({})
 export default class WarningsSettings extends Vue {
@@ -81,7 +81,7 @@ export default class WarningsSettings extends Vue {
   handleReset () {
     this.$typedDispatch('config/saveByPath', {
       path: 'uiSettings.warnings',
-      value: defaultState().uiSettings.warnings,
+      value: createState().uiSettings.warnings,
       server: true
     })
   }
diff --git a/src/components/widgets/diagnostics/config/MetricsConfigStep.vue b/src/components/widgets/diagnostics/config/MetricsConfigStep.vue
index 5984c9f96b..53f5504f8c 100644
--- a/src/components/widgets/diagnostics/config/MetricsConfigStep.vue
+++ b/src/components/widgets/diagnostics/config/MetricsConfigStep.vue
@@ -159,7 +159,7 @@
 import { Component, Vue, Prop } from 'vue-property-decorator'
 import type { DiagnosticsCardConfig } from '@/store/diagnostics/types'
 import MetricsCollectorConfig from './MetricsCollectorConfig.vue'
-import { defaultState } from '@/store/layout/state'
+import { createDiagnosticsCardState } from '@/store/layout/state'
 
 @Component({
   components: {
@@ -180,8 +180,7 @@ export default class MetricsConfigStep extends Vue {
   ]
 
   addMetric (axis: number) {
-    const defaultCard = defaultState().layouts.diagnostics.container1[0] as DiagnosticsCardConfig
-    const defaultMetric = defaultCard.axes[0].metrics[0]
+    const defaultMetric = createDiagnosticsCardState().axes[0].metrics[0]
 
     this.config.axes[axis].metrics.push(defaultMetric)
   }
diff --git a/src/store/afc/index.ts b/src/store/afc/index.ts
index c8cce5f40d..d724bd42de 100644
--- a/src/store/afc/index.ts
+++ b/src/store/afc/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { AfcState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const afc = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/afc/mutations.ts b/src/store/afc/mutations.ts
index 577c4c5eae..6140b8c72d 100644
--- a/src/store/afc/mutations.ts
+++ b/src/store/afc/mutations.ts
@@ -1,13 +1,13 @@
 import type { MutationTree } from 'vuex'
 import type { AfcDialogState, AfcState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   /**
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setDialogState (state, payload: AfcDialogState) {
diff --git a/src/store/afc/state.ts b/src/store/afc/state.ts
index 206731c651..297e43cc56 100644
--- a/src/store/afc/state.ts
+++ b/src/store/afc/state.ts
@@ -1,11 +1,9 @@
 import type { AfcState } from './types'
 
-export const defaultState = (): AfcState => {
+export const createState = (): AfcState => {
   return {
     dialog: {
       show: false
     }
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/analysis/index.ts b/src/store/analysis/index.ts
index a21c62573b..b7c0dba0e3 100644
--- a/src/store/analysis/index.ts
+++ b/src/store/analysis/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { AnalysisState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const analysis = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/analysis/mutations.ts b/src/store/analysis/mutations.ts
index 100e0903e3..63f1858336 100644
--- a/src/store/analysis/mutations.ts
+++ b/src/store/analysis/mutations.ts
@@ -1,13 +1,13 @@
 import type { MutationTree } from 'vuex'
 import type { AnalysisState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   /**
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setAnalysisStatus (state, payload: Moonraker.Analysis.StatusResponse) {
diff --git a/src/store/analysis/state.ts b/src/store/analysis/state.ts
index 53032f78c4..1b0cfee287 100644
--- a/src/store/analysis/state.ts
+++ b/src/store/analysis/state.ts
@@ -1,9 +1,7 @@
 import type { AnalysisState } from './types'
 
-export const defaultState = (): AnalysisState => {
+export const createState = (): AnalysisState => {
   return {
     status: null
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/announcements/index.ts b/src/store/announcements/index.ts
index da5ab29c3d..b703e9c2eb 100644
--- a/src/store/announcements/index.ts
+++ b/src/store/announcements/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { AnnouncementsState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const announcements = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/announcements/mutations.ts b/src/store/announcements/mutations.ts
index ce6bc0c26c..847c7baeff 100644
--- a/src/store/announcements/mutations.ts
+++ b/src/store/announcements/mutations.ts
@@ -1,5 +1,5 @@
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type { AnnouncementsState } from './types'
 
 export const mutations = {
@@ -7,7 +7,7 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setAnnouncementsList (state, payload: Moonraker.Announcements.ListResponse) {
diff --git a/src/store/announcements/state.ts b/src/store/announcements/state.ts
index ba2ec26f20..71a6f3c58c 100644
--- a/src/store/announcements/state.ts
+++ b/src/store/announcements/state.ts
@@ -1,10 +1,8 @@
 import type { AnnouncementsState } from './types'
 
-export const defaultState = (): AnnouncementsState => {
+export const createState = (): AnnouncementsState => {
   return {
     entries: [],
     feeds: []
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/auth/index.ts b/src/store/auth/index.ts
index d6ac37041b..cb216cb4aa 100644
--- a/src/store/auth/index.ts
+++ b/src/store/auth/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { AuthState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const auth = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/auth/mutations.ts b/src/store/auth/mutations.ts
index cae8c7888c..1f9db54faa 100644
--- a/src/store/auth/mutations.ts
+++ b/src/store/auth/mutations.ts
@@ -1,5 +1,5 @@
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type { AppUser, AuthState } from './types'
 
 export const mutations = {
@@ -7,7 +7,7 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setCurrentUser (state, user: AppUser | null) {
diff --git a/src/store/auth/state.ts b/src/store/auth/state.ts
index ed4c321a95..c9efdfdb43 100644
--- a/src/store/auth/state.ts
+++ b/src/store/auth/state.ts
@@ -1,11 +1,9 @@
 import type { AuthState } from './types'
 
-export const defaultState = (): AuthState => {
+export const createState = (): AuthState => {
   return {
     currentUser: null,
     users: [],
     apiKey: ''
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/charts/index.ts b/src/store/charts/index.ts
index c8242fcac2..90eb797c66 100644
--- a/src/store/charts/index.ts
+++ b/src/store/charts/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { ChartState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const charts = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/charts/mutations.ts b/src/store/charts/mutations.ts
index 71955956ff..562d75294c 100644
--- a/src/store/charts/mutations.ts
+++ b/src/store/charts/mutations.ts
@@ -3,7 +3,7 @@ import type { MutationTree } from 'vuex'
 import { appendChartSamples, createChartBuffer, resizeChartBuffer } from '@/util/chart-buffer'
 import { Globals } from '@/globals'
 import type { ChartBucket, ChartBuffer, ChartEntriesPayload, ChartEntryPayload, ChartsDbDocument, ChartSelectedLegends, ChartState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 const resolveBuffer = (state: ChartState, payload: ChartBucket): ChartBuffer => {
   switch (payload.bucket) {
@@ -37,11 +37,11 @@ export const mutations = {
    * Reset our store
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setResetChartStore (state) {
-    const { thermal, ready } = defaultState()
+    const { thermal, ready } = createState()
 
     Object.assign(state, {
       thermal,
diff --git a/src/store/charts/state.ts b/src/store/charts/state.ts
index 7d02360587..0e9f1e59c6 100644
--- a/src/store/charts/state.ts
+++ b/src/store/charts/state.ts
@@ -4,7 +4,7 @@ import type { ChartState } from './types'
 
 // Fixed-shape buckets pre-create columns so their dimension names exist from
 // the first sample; thermal and diagnostics discover theirs at runtime.
-export const defaultState = (): ChartState => {
+export const createState = (): ChartState => {
   return {
     ready: false,
     thermal: createChartBuffer(Globals.CHART_HISTORY_RETENTION),
@@ -17,5 +17,3 @@ export const defaultState = (): ChartState => {
     selectedLegends: {}
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/config/index.ts b/src/store/config/index.ts
index a5178ff968..d1ad23c668 100644
--- a/src/store/config/index.ts
+++ b/src/store/config/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { ConfigState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const config = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/config/mutations.ts b/src/store/config/mutations.ts
index 2e469fec4c..cff3009c20 100644
--- a/src/store/config/mutations.ts
+++ b/src/store/config/mutations.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import type { MutationTree } from 'vuex'
 import type { ConfigState, UiSettings, SaveByPath, InstanceConfig, TemperaturePreset, ConfiguredTableHeader, HostConfig, ApiConfig } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 import { Globals } from '@/globals'
 import { cloneDeep, mergeWith, set } from 'lodash-es'
 import { v4 as uuidv4 } from 'uuid'
@@ -13,7 +13,7 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   /**
diff --git a/src/store/config/state.ts b/src/store/config/state.ts
index 6b7fe804fd..57f7efad43 100644
--- a/src/store/config/state.ts
+++ b/src/store/config/state.ts
@@ -1,7 +1,7 @@
 import type { ConfigState } from './types'
 import { Globals } from '@/globals'
 
-export const defaultState = (): ConfigState => {
+export const createState = (): ConfigState => {
   return {
     apiUrl: '',
     socketUrl: '',
@@ -169,5 +169,3 @@ export const defaultState = (): ConfigState => {
     }
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/console/index.ts b/src/store/console/index.ts
index 6516753235..b1d200c98a 100644
--- a/src/store/console/index.ts
+++ b/src/store/console/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { ConsoleState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const console = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/console/mutations.ts b/src/store/console/mutations.ts
index 5e28d1eba0..ab81c1d8cd 100644
--- a/src/store/console/mutations.ts
+++ b/src/store/console/mutations.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { v4 as uuidv4 } from 'uuid'
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import { Globals } from '@/globals'
 import type { ConsoleEntry, ConsoleFilter, ConsoleState, PromptDialogItemButton, PromptDialogItem } from './types'
 import { escapeRegExp } from 'lodash-es'
@@ -22,7 +22,7 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   /**
@@ -49,7 +49,7 @@ export const mutations = {
   },
 
   setResetPromptDialog (state, payload: string) {
-    const { promptDialog } = defaultState()
+    const { promptDialog } = createState()
 
     Object.assign(state, {
       promptDialog: {
diff --git a/src/store/console/state.ts b/src/store/console/state.ts
index 417f8d8918..330472a884 100644
--- a/src/store/console/state.ts
+++ b/src/store/console/state.ts
@@ -1,6 +1,6 @@
 import type { ConsoleState } from './types'
 
-export const defaultState = (): ConsoleState => {
+export const createState = (): ConsoleState => {
   return {
     consoleCommand: '',
     consoleSearch: '',
@@ -19,5 +19,3 @@ export const defaultState = (): ConsoleState => {
     consoleFiltersRegexp: []
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/database/index.ts b/src/store/database/index.ts
index 7cbc13a45d..401af4f103 100644
--- a/src/store/database/index.ts
+++ b/src/store/database/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { DatabaseState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const database = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/database/mutations.ts b/src/store/database/mutations.ts
index ae89ebfd77..cc8b451283 100644
--- a/src/store/database/mutations.ts
+++ b/src/store/database/mutations.ts
@@ -1,11 +1,11 @@
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type { DatabaseInfo, DatabaseState } from './types'
 import getFilePaths from '@/util/get-file-paths'
 
 export const mutations = {
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setServerDatabaseList (state, payload: DatabaseInfo) {
diff --git a/src/store/database/state.ts b/src/store/database/state.ts
index ef6ea4956f..535d8dbe6b 100644
--- a/src/store/database/state.ts
+++ b/src/store/database/state.ts
@@ -1,9 +1,7 @@
 import type { DatabaseState } from './types'
 
-export const defaultState = (): DatabaseState => {
+export const createState = (): DatabaseState => {
   return {
     info: null
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/files/index.ts b/src/store/files/index.ts
index 0ed3892915..f835504047 100644
--- a/src/store/files/index.ts
+++ b/src/store/files/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { FilesState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const files = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/files/mutations.ts b/src/store/files/mutations.ts
index 7d115de0fb..48e0830ef3 100644
--- a/src/store/files/mutations.ts
+++ b/src/store/files/mutations.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import type { MutationTree } from 'vuex'
 import type { FilesState, MoonrakerPathContent, FilePaths, FileUpload, FileDownload } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 import { Globals } from '@/globals'
 
 export const mutations = {
@@ -9,7 +9,7 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setResetRoot (state, root: string) {
diff --git a/src/store/files/state.ts b/src/store/files/state.ts
index 1b3aad005a..2190f16455 100644
--- a/src/store/files/state.ts
+++ b/src/store/files/state.ts
@@ -1,6 +1,6 @@
 import type { FilesState } from './types'
 
-export const defaultState = (): FilesState => {
+export const createState = (): FilesState => {
   return {
     uploads: [],
     download: null,
@@ -11,5 +11,3 @@ export const defaultState = (): FilesState => {
     pathContent: {}
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/gcodePreview/index.ts b/src/store/gcodePreview/index.ts
index 5b10a9a282..bc665dfed0 100644
--- a/src/store/gcodePreview/index.ts
+++ b/src/store/gcodePreview/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { GcodePreviewState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const gcodePreview = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/gcodePreview/mutations.ts b/src/store/gcodePreview/mutations.ts
index dc4f3609ed..c192e797be 100644
--- a/src/store/gcodePreview/mutations.ts
+++ b/src/store/gcodePreview/mutations.ts
@@ -1,6 +1,6 @@
 import { markRaw } from 'vue'
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type { BBox, GcodePreviewState, Layer, MoveStore, Part } from './types'
 import type { AppFile, AppFileWithMeta } from '@/store/files/types'
 
@@ -9,7 +9,7 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setMoves (state, payload: MoveStore) {
diff --git a/src/store/gcodePreview/state.ts b/src/store/gcodePreview/state.ts
index a7c6a7b849..a4ca8e9d7d 100644
--- a/src/store/gcodePreview/state.ts
+++ b/src/store/gcodePreview/state.ts
@@ -12,7 +12,7 @@ export const defaultMoveStore: MoveStore = Object.freeze({
   length: 0
 })
 
-export const defaultState = (): GcodePreviewState => {
+export const createState = (): GcodePreviewState => {
   return {
     moves: defaultMoveStore,
     layers: [],
@@ -24,5 +24,3 @@ export const defaultState = (): GcodePreviewState => {
     parserWorker: null
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/history/index.ts b/src/store/history/index.ts
index cbb7a39cf7..4875c92882 100644
--- a/src/store/history/index.ts
+++ b/src/store/history/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { HistoryState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const history = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/history/mutations.ts b/src/store/history/mutations.ts
index 1cc1bf68e3..c1d5394816 100644
--- a/src/store/history/mutations.ts
+++ b/src/store/history/mutations.ts
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type { HistoryState } from './types'
 
 export const mutations = {
@@ -8,7 +8,7 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   /**
diff --git a/src/store/history/state.ts b/src/store/history/state.ts
index 722689b11b..d255ffc6aa 100644
--- a/src/store/history/state.ts
+++ b/src/store/history/state.ts
@@ -1,6 +1,6 @@
 import type { HistoryState } from './types'
 
-export const defaultState = (): HistoryState => {
+export const createState = (): HistoryState => {
   return {
     jobs: [],
     unresolvedJobIds: new Set(),
@@ -15,5 +15,3 @@ export const defaultState = (): HistoryState => {
     }
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/jobQueue/index.ts b/src/store/jobQueue/index.ts
index 013ae83505..6b2dace413 100644
--- a/src/store/jobQueue/index.ts
+++ b/src/store/jobQueue/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { JobQueueState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const jobQueue = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/jobQueue/mutations.ts b/src/store/jobQueue/mutations.ts
index 649cfa540a..ea318ee59f 100644
--- a/src/store/jobQueue/mutations.ts
+++ b/src/store/jobQueue/mutations.ts
@@ -1,10 +1,10 @@
 import type { MutationTree } from 'vuex'
 import type { JobQueueState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setQueueState (state, payload: Moonraker.JobQueue.QueueState) {
diff --git a/src/store/jobQueue/state.ts b/src/store/jobQueue/state.ts
index e0b299ef41..9aba47b2b1 100644
--- a/src/store/jobQueue/state.ts
+++ b/src/store/jobQueue/state.ts
@@ -1,10 +1,8 @@
 import type { JobQueueState } from './types'
 
-export const defaultState = (): JobQueueState => {
+export const createState = (): JobQueueState => {
   return {
     queueState: 'paused',
     queuedJobs: []
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/layout/index.ts b/src/store/layout/index.ts
index e8d7ac74bd..dbc120b282 100644
--- a/src/store/layout/index.ts
+++ b/src/store/layout/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { LayoutState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const layout = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/layout/mutations.ts b/src/store/layout/mutations.ts
index f85813dd9e..534adb9f35 100644
--- a/src/store/layout/mutations.ts
+++ b/src/store/layout/mutations.ts
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import type { MutationTree } from 'vuex'
-import { defaultState as getDefaultState } from './state'
+import { createState } from './state'
 import type { LayoutConfig, LayoutState, LayoutContainer } from './types'
 import type { DiagnosticsCardContainer } from '../diagnostics/types'
 
@@ -9,7 +9,7 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, getDefaultState())
+    Object.assign(state, createState())
   },
 
   /**
@@ -20,10 +20,10 @@ export const mutations = {
    */
   setInitLayout (state, payload: LayoutState) {
     if (payload && Object.keys(payload).length > 0) {
-      const defaultState = getDefaultState()
+      const defaultLayouts = createState().layouts
 
       // add new layouts
-      for (const [layoutKey, defaultLayout] of Object.entries(defaultState.layouts)) {
+      for (const [layoutKey, defaultLayout] of Object.entries(defaultLayouts)) {
         if (!payload.layouts[layoutKey]) {
           payload.layouts[layoutKey] = defaultLayout
         }
@@ -43,7 +43,7 @@ export const mutations = {
         const migratableLayoutKey = migratableLayoutKeys.find(key => layoutKey.startsWith(key))
 
         if (migratableLayoutKey) {
-          const defaultLayout = defaultState.layouts[migratableLayoutKey]
+          const defaultLayout = defaultLayouts[migratableLayoutKey]
           const defaultComponentIds = Object.values(defaultLayout).flat().map(card => card.id)
           const currentComponentIds = Object.values(currentLayout).flat().map(card => card.id)
 
diff --git a/src/store/layout/state.ts b/src/store/layout/state.ts
index 2a1276a16a..36e57ac9ff 100644
--- a/src/store/layout/state.ts
+++ b/src/store/layout/state.ts
@@ -1,6 +1,46 @@
 import type { LayoutState } from './types'
 import { v4 as uuidv4 } from 'uuid'
-import type { DiagnosticsCardContainer } from '@/store/diagnostics/types'
+import type { DiagnosticsCardConfig } from '@/store/diagnostics/types'
+
+export const createDiagnosticsCardState = (): DiagnosticsCardConfig => {
+  return {
+    id: uuidv4(),
+    enabled: true,
+    title: 'Speeds',
+    collapsed: false,
+    height: 300,
+    icon: 'motion',
+    axes: [{
+      enabled: true,
+      unit: 'mm/s',
+      showLegend: true,
+      metrics: [{
+        collector: 'printer.motion_report.live_velocity',
+        name: 'Velocity',
+        style: { lineStyle: 'solid', lineColor: '#2196f3', fillColor: null, fillOpacity: 0, displayLegend: true }
+      }, {
+        collector: 'printer.toolhead.max_velocity',
+        name: 'Max Velocity',
+        style: { lineStyle: 'dotted', lineColor: '#0075d2', fillColor: null, fillOpacity: 0, displayLegend: false }
+      }]
+    }, {
+      enabled: true,
+      unit: 'mm³/s',
+      showLegend: true,
+      max: 20,
+      metrics: [{
+        collector: 'printer.motion_report.live_extruder_velocity * Math.PI * ' +
+          '(printer.configfile.settings.extruder.filament_diameter / 2) ** 2',
+        name: 'Flow',
+        style: { lineStyle: 'solid', lineColor: '#b12f36', fillColor: null, fillOpacity: 5, displayLegend: true }
+      }, {
+        collector: '12',
+        name: 'Max Flow',
+        style: { lineStyle: 'dashed', lineColor: '#820007', fillColor: null, fillOpacity: 0, displayLegend: false }
+      }]
+    }]
+  }
+}
 
 /**
  * Maintains the state of our page layouts.
@@ -9,7 +49,7 @@ import type { DiagnosticsCardContainer } from '@/store/diagnostics/types'
  * - If card is collapsed or not.
  * - If card is enabled or not.
  */
-export const defaultState = (): LayoutState => {
+export const createState = (): LayoutState => {
   return {
     layouts: {
       dashboard: {
@@ -38,46 +78,8 @@ export const defaultState = (): LayoutState => {
         ]
       },
       diagnostics: {
-        container1: [{
-          id: uuidv4(),
-          enabled: true,
-          title: 'Speeds',
-          collapsed: false,
-          height: 300,
-          icon: 'motion',
-          axes: [{
-            enabled: true,
-            unit: 'mm/s',
-            showLegend: true,
-            metrics: [{
-              collector: 'printer.motion_report.live_velocity',
-              name: 'Velocity',
-              style: { lineStyle: 'solid', lineColor: '#2196f3', fillColor: null, fillOpacity: 0, displayLegend: true }
-            }, {
-              collector: 'printer.toolhead.max_velocity',
-              name: 'Max Velocity',
-              style: { lineStyle: 'dotted', lineColor: '#0075d2', fillColor: null, fillOpacity: 0, displayLegend: false }
-            }]
-          }, {
-            enabled: true,
-            unit: 'mm³/s',
-            showLegend: true,
-            max: 20,
-            metrics: [{
-              collector: 'printer.motion_report.live_extruder_velocity * Math.PI * ' +
-                '(printer.configfile.settings.extruder.filament_diameter / 2) ** 2',
-              name: 'Flow',
-              style: { lineStyle: 'solid', lineColor: '#b12f36', fillColor: null, fillOpacity: 5, displayLegend: true }
-            }, {
-              collector: '12',
-              name: 'Max Flow',
-              style: { lineStyle: 'dashed', lineColor: '#820007', fillColor: null, fillOpacity: 0, displayLegend: false }
-            }]
-          }]
-        }]
-      } as DiagnosticsCardContainer
+        container1: [createDiagnosticsCardState()]
+      }
     }
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/macros/index.ts b/src/store/macros/index.ts
index 00ea03a07f..73fcef7339 100644
--- a/src/store/macros/index.ts
+++ b/src/store/macros/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { MacrosState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const macros = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/macros/mutations.ts b/src/store/macros/mutations.ts
index 81f8601a17..814d5ac495 100644
--- a/src/store/macros/mutations.ts
+++ b/src/store/macros/mutations.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { v4 as uuidv4 } from 'uuid'
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type { Macro, MacroCategory, MacrosState } from './types'
 import { MACRO_DEFAULTS } from '@/store/macros/getters'
 
@@ -20,7 +20,7 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   // Sets macro state from db
diff --git a/src/store/macros/state.ts b/src/store/macros/state.ts
index 1e493b8426..f7a4ad5d35 100644
--- a/src/store/macros/state.ts
+++ b/src/store/macros/state.ts
@@ -1,11 +1,9 @@
 import type { MacrosState } from './types'
 
-export const defaultState = (): MacrosState => {
+export const createState = (): MacrosState => {
   return {
     stored: [],
     categories: [],
     expanded: [0]
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/mesh/index.ts b/src/store/mesh/index.ts
index eb5eba7bfb..ba56d34cec 100644
--- a/src/store/mesh/index.ts
+++ b/src/store/mesh/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { MeshState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const mesh = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/mesh/mutations.ts b/src/store/mesh/mutations.ts
index a03ffb5db1..ca4967b41d 100644
--- a/src/store/mesh/mutations.ts
+++ b/src/store/mesh/mutations.ts
@@ -1,5 +1,5 @@
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type { MatrixType, MeshState } from './types'
 
 export const mutations = {
@@ -7,7 +7,7 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setMatrix (state, payload: MatrixType) {
diff --git a/src/store/mesh/state.ts b/src/store/mesh/state.ts
index 0830b7c8a6..d577707491 100644
--- a/src/store/mesh/state.ts
+++ b/src/store/mesh/state.ts
@@ -1,6 +1,6 @@
 import type { MeshState } from './types'
 
-export const defaultState = (): MeshState => {
+export const createState = (): MeshState => {
   return {
     range: 0,
     wireframe: false,
@@ -10,5 +10,3 @@ export const defaultState = (): MeshState => {
     matrix: 'mesh_matrix'
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/mmu/index.ts b/src/store/mmu/index.ts
index 45d6e970b9..679982c29a 100644
--- a/src/store/mmu/index.ts
+++ b/src/store/mmu/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { MmuState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const mmu = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/mmu/mutations.ts b/src/store/mmu/mutations.ts
index 8aefd1f88c..cceda03f6d 100644
--- a/src/store/mmu/mutations.ts
+++ b/src/store/mmu/mutations.ts
@@ -1,13 +1,13 @@
 import type { MutationTree } from 'vuex'
 import type { MmuDialogState, MmuState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   /**
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setDialogState (state, payload: MmuDialogState) {
diff --git a/src/store/mmu/state.ts b/src/store/mmu/state.ts
index ad7f934427..282dedd3f6 100644
--- a/src/store/mmu/state.ts
+++ b/src/store/mmu/state.ts
@@ -1,11 +1,9 @@
 import type { MmuState } from './types'
 
-export const defaultState = (): MmuState => {
+export const createState = (): MmuState => {
   return {
     dialog: {
       show: false
     }
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/notifications/index.ts b/src/store/notifications/index.ts
index b4ad4b31f1..34feb1606b 100644
--- a/src/store/notifications/index.ts
+++ b/src/store/notifications/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { NotificationsState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const notifications = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/notifications/mutations.ts b/src/store/notifications/mutations.ts
index eab243d7aa..f9a1f51f68 100644
--- a/src/store/notifications/mutations.ts
+++ b/src/store/notifications/mutations.ts
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type { NotificationsState, AppNotification } from './types'
 
 export const mutations = {
@@ -8,7 +8,7 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setPushNotification (state, n: AppNotification) {
diff --git a/src/store/notifications/state.ts b/src/store/notifications/state.ts
index 5bcaafe6dc..8d5751a528 100644
--- a/src/store/notifications/state.ts
+++ b/src/store/notifications/state.ts
@@ -1,6 +1,6 @@
 import type { NotificationsState } from './types'
 
-export const defaultState = (): NotificationsState => {
+export const createState = (): NotificationsState => {
   return {
     notifications: []
 
@@ -23,5 +23,3 @@ export const defaultState = (): NotificationsState => {
 
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/power/index.ts b/src/store/power/index.ts
index 749f3ade5c..91a878790d 100644
--- a/src/store/power/index.ts
+++ b/src/store/power/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { DevicePowerState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const power = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/power/mutations.ts b/src/store/power/mutations.ts
index 3b7451e5bf..5eb7bde304 100644
--- a/src/store/power/mutations.ts
+++ b/src/store/power/mutations.ts
@@ -1,13 +1,13 @@
 import type { MutationTree } from 'vuex'
 import type { DevicePowerState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   /**
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setDevices (state, payload: Moonraker.Power.DevicesResponse) {
diff --git a/src/store/power/state.ts b/src/store/power/state.ts
index 2b211e51d4..9a068aa1ef 100644
--- a/src/store/power/state.ts
+++ b/src/store/power/state.ts
@@ -1,9 +1,7 @@
 import type { DevicePowerState } from './types'
 
-export const defaultState = (): DevicePowerState => {
+export const createState = (): DevicePowerState => {
   return {
     devices: []
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/printer/index.ts b/src/store/printer/index.ts
index 84f875fc24..3beacd24ec 100644
--- a/src/store/printer/index.ts
+++ b/src/store/printer/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { PrinterState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const printer = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/printer/mutations.ts b/src/store/printer/mutations.ts
index 1612318e34..51dcd4d0fc 100644
--- a/src/store/printer/mutations.ts
+++ b/src/store/printer/mutations.ts
@@ -1,14 +1,14 @@
 import Vue from 'vue'
 import type { MutationTree } from 'vuex'
 import type { PrinterState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   /**
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setManualProbeDialogOpen (state, payload: boolean) {
diff --git a/src/store/printer/state.ts b/src/store/printer/state.ts
index 728db435ca..3598cbaedc 100644
--- a/src/store/printer/state.ts
+++ b/src/store/printer/state.ts
@@ -4,7 +4,7 @@ import type { PrinterState } from './types'
  * Maintains the state of the printer, by way of moonraker notifications.
  * We should never directly modify data here.
  */
-export const defaultState = (): PrinterState => {
+export const createState = (): PrinterState => {
   return {
     info: null,
     manualProbeDialogOpen: false,
@@ -60,5 +60,3 @@ export const defaultState = (): PrinterState => {
     }
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/sensors/index.ts b/src/store/sensors/index.ts
index aa84b5bbe0..52d1d674ef 100644
--- a/src/store/sensors/index.ts
+++ b/src/store/sensors/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { MoonrakerSensorsState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const sensors = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/sensors/mutations.ts b/src/store/sensors/mutations.ts
index 353e088df8..3618eb2a4c 100644
--- a/src/store/sensors/mutations.ts
+++ b/src/store/sensors/mutations.ts
@@ -1,13 +1,13 @@
 import type { MutationTree } from 'vuex'
 import type { MoonrakerSensorsState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   /**
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setInitSensors (state, payload: Partial<MoonrakerSensorsState>) {
diff --git a/src/store/sensors/state.ts b/src/store/sensors/state.ts
index 153208a5d7..0fa4c1dd5c 100644
--- a/src/store/sensors/state.ts
+++ b/src/store/sensors/state.ts
@@ -1,10 +1,8 @@
 import type { MoonrakerSensorsState } from './types'
 
-export const defaultState = (): MoonrakerSensorsState => {
+export const createState = (): MoonrakerSensorsState => {
   return {
     sensors: {},
     expanded: []
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/server/index.ts b/src/store/server/index.ts
index 2c6bf823c1..dd183c5865 100644
--- a/src/store/server/index.ts
+++ b/src/store/server/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { ServerState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const server = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/server/mutations.ts b/src/store/server/mutations.ts
index 7397a6a313..0eac8f636c 100644
--- a/src/store/server/mutations.ts
+++ b/src/store/server/mutations.ts
@@ -1,5 +1,5 @@
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type { Peripherals, ServerState } from './types'
 
 export const mutations = {
@@ -7,11 +7,11 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setResetKlippy (state) {
-    const { info } = defaultState()
+    const { info } = createState()
 
     state.info.klippy_connected = info.klippy_connected
     state.info.klippy_state = info.klippy_state
diff --git a/src/store/server/state.ts b/src/store/server/state.ts
index a209d3bad7..4766bd468e 100644
--- a/src/store/server/state.ts
+++ b/src/store/server/state.ts
@@ -1,6 +1,6 @@
 import type { ServerState } from './types'
 
-export const defaultState = (): ServerState => {
+export const createState = (): ServerState => {
   return {
     info: {
       failed_components: [],
@@ -32,5 +32,3 @@ export const defaultState = (): ServerState => {
     websocket_connections: null
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/socket/index.ts b/src/store/socket/index.ts
index 3ae1214926..62378fec73 100644
--- a/src/store/socket/index.ts
+++ b/src/store/socket/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { SocketState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const socket = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/socket/mutations.ts b/src/store/socket/mutations.ts
index c0ac5530f5..9036bd9e0a 100644
--- a/src/store/socket/mutations.ts
+++ b/src/store/socket/mutations.ts
@@ -1,10 +1,10 @@
 import type { MutationTree } from 'vuex'
 import type { SocketState, SocketStatus } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setStatus (state, payload: SocketStatus) {
diff --git a/src/store/socket/state.ts b/src/store/socket/state.ts
index 2be9cdf555..64f45f1e84 100644
--- a/src/store/socket/state.ts
+++ b/src/store/socket/state.ts
@@ -1,11 +1,9 @@
 import type { SocketState } from './types'
 
-export const defaultState = (): SocketState => {
+export const createState = (): SocketState => {
   return {
     status: 'initializing',
     acceptingNotifications: false,
     connectionId: null
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/spoolman/index.ts b/src/store/spoolman/index.ts
index d19a9d4f34..624c1c079f 100644
--- a/src/store/spoolman/index.ts
+++ b/src/store/spoolman/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { SpoolmanState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const spoolman = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/spoolman/mutations.ts b/src/store/spoolman/mutations.ts
index 361e593d49..302efb382f 100644
--- a/src/store/spoolman/mutations.ts
+++ b/src/store/spoolman/mutations.ts
@@ -1,6 +1,6 @@
 import { markRaw } from 'vue'
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type {
   SpoolmanState,
   SpoolSelectionDialogState
@@ -13,7 +13,7 @@ export const mutations = {
    */
   setReset (state) {
     state.socket?.close()
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setActiveSpool (state, payload: number) {
diff --git a/src/store/spoolman/state.ts b/src/store/spoolman/state.ts
index 5301580b59..2ee6db30ee 100644
--- a/src/store/spoolman/state.ts
+++ b/src/store/spoolman/state.ts
@@ -1,6 +1,6 @@
 import type { SpoolmanState } from './types'
 
-export const defaultState = (): SpoolmanState => {
+export const createState = (): SpoolmanState => {
   return {
     info: null,
     spools: [],
@@ -14,5 +14,3 @@ export const defaultState = (): SpoolmanState => {
     socketDiagnostic: null
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/timelapse/index.ts b/src/store/timelapse/index.ts
index 18ee44b637..10443457da 100644
--- a/src/store/timelapse/index.ts
+++ b/src/store/timelapse/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { TimelapseState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const timelapse = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/timelapse/mutations.ts b/src/store/timelapse/mutations.ts
index 36743998f9..5bf606f775 100644
--- a/src/store/timelapse/mutations.ts
+++ b/src/store/timelapse/mutations.ts
@@ -1,5 +1,5 @@
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type { TimelapseState } from './types'
 
 export const mutations = {
@@ -7,7 +7,7 @@ export const mutations = {
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setSettings (state, payload: Moonraker.Timelapse.SettingsResponse) {
diff --git a/src/store/timelapse/state.ts b/src/store/timelapse/state.ts
index 4a89220934..6e38049137 100644
--- a/src/store/timelapse/state.ts
+++ b/src/store/timelapse/state.ts
@@ -34,12 +34,10 @@ export const defaultWritableSettings: Moonraker.Timelapse.WriteableSettings = Ob
   saveframes: false
 })
 
-export const defaultState = (): TimelapseState => {
+export const createState = (): TimelapseState => {
   return {
     lastFrame: null,
     settings: null,
     renderStatus: null
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/types.ts b/src/store/types.ts
index f45f95cd3e..ce122fa4ef 100644
--- a/src/store/types.ts
+++ b/src/store/types.ts
@@ -59,7 +59,7 @@ type RootModulesType = {
 }
 
 type RootStateType = {
-  [K in keyof RootModulesType]: RootModulesType[K] extends { state: infer U } ? U : never
+  [K in keyof RootModulesType]: ReturnType<RootModulesType[K]['state']>
 }
 
 type RootGettersType = UnionToIntersection<{
diff --git a/src/store/version/index.ts b/src/store/version/index.ts
index b413edef1f..e0130d9dc4 100644
--- a/src/store/version/index.ts
+++ b/src/store/version/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { VersionState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const version = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/version/mutations.ts b/src/store/version/mutations.ts
index dc203927b1..62b71f45a0 100644
--- a/src/store/version/mutations.ts
+++ b/src/store/version/mutations.ts
@@ -1,13 +1,13 @@
 import type { MutationTree } from 'vuex'
 import type { VersionState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   /**
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setUpdateStatus (state, payload: Partial<Moonraker.UpdateManager.StatusResponse>) {
diff --git a/src/store/version/state.ts b/src/store/version/state.ts
index 936e2378db..052660a4d3 100644
--- a/src/store/version/state.ts
+++ b/src/store/version/state.ts
@@ -1,10 +1,8 @@
 import type { VersionState } from './types'
 
-export const defaultState = (): VersionState => {
+export const createState = (): VersionState => {
   return {
     status: null,
     responses: [],
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/wait/index.ts b/src/store/wait/index.ts
index 2cf28a3186..03b91a1db3 100644
--- a/src/store/wait/index.ts
+++ b/src/store/wait/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { WaitState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const wait = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/wait/mutations.ts b/src/store/wait/mutations.ts
index 83e2200a9c..0bd60d700f 100644
--- a/src/store/wait/mutations.ts
+++ b/src/store/wait/mutations.ts
@@ -1,13 +1,13 @@
 import type { MutationTree } from 'vuex'
 import type { WaitState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   /**
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   /**
diff --git a/src/store/wait/state.ts b/src/store/wait/state.ts
index e7945a8759..563f629e1d 100644
--- a/src/store/wait/state.ts
+++ b/src/store/wait/state.ts
@@ -1,9 +1,7 @@
 import type { WaitState } from './types'
 
-export const defaultState = (): WaitState => {
+export const createState = (): WaitState => {
   return {
     waits: []
   }
 }
-
-export const state = defaultState()
diff --git a/src/store/webcams/index.ts b/src/store/webcams/index.ts
index f40f84e944..f90ae3a7ca 100644
--- a/src/store/webcams/index.ts
+++ b/src/store/webcams/index.ts
@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { WebcamsState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const webcams = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations
diff --git a/src/store/webcams/mutations.ts b/src/store/webcams/mutations.ts
index 4e5f740a74..0d8c56d87c 100644
--- a/src/store/webcams/mutations.ts
+++ b/src/store/webcams/mutations.ts
@@ -1,11 +1,11 @@
 import Vue from 'vue'
 import type { MutationTree } from 'vuex'
 import type { WebcamsState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setInitWebcams (state, payload: { activeWebcam?: string }) {
diff --git a/src/store/webcams/state.ts b/src/store/webcams/state.ts
index 14af925f8c..53c9d409e0 100644
--- a/src/store/webcams/state.ts
+++ b/src/store/webcams/state.ts
@@ -1,10 +1,8 @@
 import type { WebcamsState } from './types'
 
-export const defaultState = (): WebcamsState => {
+export const createState = (): WebcamsState => {
   return {
     webcams: [],
     activeWebcam: 'all'
   }
 }
-
-export const state = defaultState()
diff --git a/src/views/Diagnostics.vue b/src/views/Diagnostics.vue
index fb63d1abc0..0f231a6751 100644
--- a/src/views/Diagnostics.vue
+++ b/src/views/Diagnostics.vue
@@ -74,7 +74,7 @@ import type { DiagnosticsCardConfig, DiagnosticsCardContainer } from '@/store/di
 import DiagnosticsCard from '@/components/widgets/diagnostics/DiagnosticsCard.vue'
 import DiagnosticsCardConfigDialog from '@/components/widgets/diagnostics/DiagnosticsCardConfigDialog.vue'
 import type { LayoutConfig } from '@/store/layout/types'
-import { defaultState } from '@/store/layout/state'
+import { createDiagnosticsCardState } from '@/store/layout/state'
 import type Sortable from 'sortablejs'
 
 @Component({
@@ -96,9 +96,9 @@ export default class Diagnostics extends Mixins(StateMixin) {
   }
 
   handleAddCard () {
-    const clonedDefaultCard = JSON.parse(JSON.stringify(defaultState().layouts.diagnostics.container1[0])) as DiagnosticsCardConfig
-    clonedDefaultCard.id = ''
-    this.dialogState.card = clonedDefaultCard
+    const defaultCard = createDiagnosticsCardState()
+    defaultCard.id = ''
+    this.dialogState.card = defaultCard
     this.dialogState.active = true
   }