diff --git a/src/components/panels/HistoryListPanel.vue b/src/components/panels/HistoryListPanel.vue
index db3e688c..13a51751 100644
--- a/src/components/panels/HistoryListPanel.vue
+++ b/src/components/panels/HistoryListPanel.vue
@@ -18,14 +18,6 @@
                     </v-menu>
                 </v-item-group>
             </v-card-title>
-            <v-card-subtitle>
-                <v-tooltip top v-if="!boolAllData">
-                    <template v-slot:activator="{ on, attrs }">
-                        <span v-bind="attrs" v-on="on" @click="loadAllData" style="cursor: pointer;">{{ $t('History.Last14Days') }}</span>
-                    </template>
-                    <span>{{ $t('History.LoadAllHistoryData') }}</span>
-                </v-tooltip>
-            </v-card-subtitle>
             <v-card-text>
                 <v-text-field
                     v-model="search"
@@ -241,7 +233,6 @@
 <script>
 import {mapGetters, mapState} from 'vuex'
 import VueLoadImage from 'vue-load-image'
-import Vue from "vue";
 
     export default {
         components: {
@@ -493,10 +484,6 @@ import Vue from "vue";
 
                 return 400
             },
-            loadAllData() {
-                this.boolAllData = true
-                Vue.prototype.$socket.sendObj('server.history.list', { }, 'server/history/getHistory')
-            }
         },
         watch: {
             hideColums: function(newVal) {
diff --git a/src/locales/en.js b/src/locales/en.js
index df9816aa..ae434dd9 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -137,8 +137,6 @@ export default {
 		FilamentUsage: "Filament usage",
 		PrinttimeAvg: "Printtime AVG",
 		PrintHistory: "Print History",
-		Last14Days: "Last 14 days",
-		LoadAllHistoryData: "Click to load all history data",
 		Search: "search",
 		Jobs: "Jobs",
 		Empty: "empty",
diff --git a/src/store/server/actions.js b/src/store/server/actions.js
index 6e864e9b..2d5358f6 100644
--- a/src/store/server/actions.js
+++ b/src/store/server/actions.js
@@ -59,10 +59,7 @@ export default {
 				Vue.prototype.$socket.sendObj('machine.update.status', {}, 'server/updateManager/getStatus')
 
 			if (payload.plugins.includes("history") !== false) {
-				// load the last 14 days
-				const since = new Date().getTime() / 1000 - 60 * 60 * 24 * 14
-
-				Vue.prototype.$socket.sendObj('server.history.list', { since: since}, 'server/history/getHistory')
+				Vue.prototype.$socket.sendObj('server.history.list', { start: 1, limit: 50 }, 'server/history/getHistory')
 				Vue.prototype.$socket.sendObj('server.history.totals', {}, 'server/history/getTotals')
 			}
 		}
diff --git a/src/store/server/history/actions.js b/src/store/server/history/actions.js
index 52aafd9f..27dd84df 100644
--- a/src/store/server/history/actions.js
+++ b/src/store/server/history/actions.js
@@ -9,12 +9,24 @@ export default {
 		commit('setTotals', payload.job_totals)
 	},
 
-	getHistory({ commit }, payload) {
-		commit('resetJobs')
+	getHistory({ commit, state }, payload) {
+		if (
+			'requestParams' in payload &&
+			'start' in payload.requestParams &&
+			payload.requestParams.start === 0
+		) commit('resetJobs')
 
 		payload.jobs.forEach(job => {
-			commit('addJob', job)
+			if (state.jobs.findIndex(stateJob => stateJob.job_id === job.job_id) === -1) commit('addJob', job)
 		})
+
+		if (
+			'requestParams' in payload &&
+			'start' in payload.requestParams &&
+			'limit' in payload.requestParams &&
+			payload.requestParams.limit > 0 &&
+			payload.jobs.length === payload.requestParams.limit
+		) Vue.prototype.$socket.sendObj('server.history.list', { start: payload.requestParams.start + payload.requestParams.limit + 1, limit: payload.requestParams.limit }, 'server/history/getHistory')
 	},
 
 	getChanged({ commit }, payload) {