diff --git a/src/components/charts/TempChart.vue b/src/components/charts/TempChart.vue
index 18c45d94..bf0b199b 100644
--- a/src/components/charts/TempChart.vue
+++ b/src/components/charts/TempChart.vue
@@ -199,7 +199,7 @@ export default class TempChart extends Mixins(BaseMixin) {
     }
 
     get maxHistory() {
-        return this.$store.getters['server/getConfig']('server', 'temperature_store_size') ?? 1200
+        return this.$store.getters['printer/tempHistory/getTemperatureStoreSize']
     }
 
     get series() {
diff --git a/src/store/printer/tempHistory/actions.ts b/src/store/printer/tempHistory/actions.ts
index a980f835..877155b9 100644
--- a/src/store/printer/tempHistory/actions.ts
+++ b/src/store/printer/tempHistory/actions.ts
@@ -27,7 +27,7 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
 
         const now = new Date()
         const allSensors = rootGetters['printer/getAvailableSensors'] ?? []
-        const maxHistory = rootGetters['server/getConfig']('server', 'temperature_store_size') || 1200
+        const maxHistory = rootGetters['printer/tempHistory/getTemperatureStoreSize']
 
         if (payload !== undefined) {
             if ('requestParams' in payload) delete payload.requestParams
@@ -267,7 +267,7 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
 
             await commit('addToSource', {
                 data: data,
-                maxHistory: rootGetters['server/getConfig']('server', 'temperature_store_size') || 1200,
+                maxHistory: rootGetters['printer/tempHistory/getTemperatureStoreSize'],
             })
         }
 
diff --git a/src/store/printer/tempHistory/getters.ts b/src/store/printer/tempHistory/getters.ts
index 061ecb42..19245f68 100644
--- a/src/store/printer/tempHistory/getters.ts
+++ b/src/store/printer/tempHistory/getters.ts
@@ -98,4 +98,11 @@ export const getters: GetterTree<PrinterTempHistoryState, RootState> = {
 
         return selected
     },
+
+    getTemperatureStoreSize: (state, getters, rootState, rootGetters) => {
+        const serverSize = rootGetters['server/getConfig']('server', 'temperature_store_size')
+        const dataStoreSize = rootGetters['server/getConfig']('data_store', 'temperature_store_size')
+
+        return dataStoreSize ?? serverSize ?? 1200
+    },
 }
diff --git a/src/store/server/mutations.ts b/src/store/server/mutations.ts
index 5bbb4a38..924207e7 100644
--- a/src/store/server/mutations.ts
+++ b/src/store/server/mutations.ts
@@ -63,9 +63,7 @@ export const mutations: MutationTree<ServerState> = {
     },
 
     setConfig(state, payload) {
-        Object.entries(payload.config).forEach(([key, value]) => {
-            Vue.set(state.config, key, value)
-        })
+        Vue.set(state, 'config', payload)
     },
 
     setConsoleClearedThisSession(state) {