diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js
index 9fa3c6e..ce82f5d 100644
--- a/src/main/resources/static/js/datatransfer.js
+++ b/src/main/resources/static/js/datatransfer.js
@@ -40,6 +40,8 @@ function getData(){
     });
 }
 
+
+
 function checkUuid(){
     if(clientUUID == null || clientUUID == undefined || clientUUID == ''){
         clientUUID = json[0].clientUUID;
diff --git a/src/main/resources/static/js/historyloader.js b/src/main/resources/static/js/historyloader.js
index f5437e5..b9c2729 100644
--- a/src/main/resources/static/js/historyloader.js
+++ b/src/main/resources/static/js/historyloader.js
@@ -52,6 +52,13 @@ function loadHistory(dateFrom, dateTo){
     });
 }
 
+function getLast24hHistoryData(){
+    $.getJSON(host + '/api/event/' + clientUUID + '/' + lastId, function(data){
+        historyJson = data;
+        displayHistory();
+    });
+}
+
 function historyToHtml(){
     var innerHTML = '';
     var iterations = historyJson.length <= maxIterations ? historyJson.length : maxIterations;
diff --git a/src/main/resources/static/js/uianimation.js b/src/main/resources/static/js/uianimation.js
index e938af3..2d7add0 100644
--- a/src/main/resources/static/js/uianimation.js
+++ b/src/main/resources/static/js/uianimation.js
@@ -22,8 +22,9 @@ function changeAdvancedVisibility(){
     setCookie();
 }
 
+const historyFilter = $('#history-filter');
 const historyFilterSwitch = function(){
-    $('#history-filter').toggleClass('active');
+    historyFilter.toggleClass('active');
 }
 
 $("#optional").click(changeAdvancedVisibility);
@@ -40,8 +41,16 @@ function showHistory(){
     $('#history').addClass('active');
     $('#historyTab').addClass('active');
     $('#historyTab').off('click');
+    initializeHistory();
 }
 
+function initializeHistory(){
+    historyFilter.removeClass('active');
+    getLast24hHistoryData();
+}
+
+
+
 function showHeaders(){
     $('#historyTab').click(showHistory);
     tabitem.removeClass('active');
diff --git a/target/classes/static/js/datatransfer.js b/target/classes/static/js/datatransfer.js
index 9fa3c6e..ce82f5d 100644
--- a/target/classes/static/js/datatransfer.js
+++ b/target/classes/static/js/datatransfer.js
@@ -40,6 +40,8 @@ function getData(){
     });
 }
 
+
+
 function checkUuid(){
     if(clientUUID == null || clientUUID == undefined || clientUUID == ''){
         clientUUID = json[0].clientUUID;
diff --git a/target/classes/static/js/historyloader.js b/target/classes/static/js/historyloader.js
index f5437e5..b9c2729 100644
--- a/target/classes/static/js/historyloader.js
+++ b/target/classes/static/js/historyloader.js
@@ -52,6 +52,13 @@ function loadHistory(dateFrom, dateTo){
     });
 }
 
+function getLast24hHistoryData(){
+    $.getJSON(host + '/api/event/' + clientUUID + '/' + lastId, function(data){
+        historyJson = data;
+        displayHistory();
+    });
+}
+
 function historyToHtml(){
     var innerHTML = '';
     var iterations = historyJson.length <= maxIterations ? historyJson.length : maxIterations;
diff --git a/target/classes/static/js/uianimation.js b/target/classes/static/js/uianimation.js
index e938af3..2d7add0 100644
--- a/target/classes/static/js/uianimation.js
+++ b/target/classes/static/js/uianimation.js
@@ -22,8 +22,9 @@ function changeAdvancedVisibility(){
     setCookie();
 }
 
+const historyFilter = $('#history-filter');
 const historyFilterSwitch = function(){
-    $('#history-filter').toggleClass('active');
+    historyFilter.toggleClass('active');
 }
 
 $("#optional").click(changeAdvancedVisibility);
@@ -40,8 +41,16 @@ function showHistory(){
     $('#history').addClass('active');
     $('#historyTab').addClass('active');
     $('#historyTab').off('click');
+    initializeHistory();
 }
 
+function initializeHistory(){
+    historyFilter.removeClass('active');
+    getLast24hHistoryData();
+}
+
+
+
 function showHeaders(){
     $('#historyTab').click(showHistory);
     tabitem.removeClass('active');