diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3963fce..9c45817 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [v2.0.1] - 2024-08-31
-### Changed
+## [v2.0.1] - 2024-09-01
+### Added
+- Remember `sort` field
+
+### Fixed
+- Bug [#103](https://github.com/aceberg/WatchYourLAN/issues/103)
 
 ## [v2.0.0] - 2024-08-30
 ### Added
diff --git a/internal/web/public/js/index.js b/internal/web/public/js/index.js
index dfde66a..a15a7d6 100644
--- a/internal/web/public/js/index.js
+++ b/internal/web/public/js/index.js
@@ -49,11 +49,15 @@ async function loadAddrs() {
     addrsArray = await (await fetch(url)).json();
     bkpArray = addrsArray;
 
-    displayArrayData(addrsArray);
+    field = localStorage.getItem("sortField");
+
+    checkNotEmpty(addrsArray);
 }
 
-function sortBy(field) {
-    sortByAny(addrsArray, field);
+function sortBy(f) {
+    field = f;
+    localStorage.setItem("sortField", field);
+    checkNotEmpty(addrsArray);
 }
 
 function editClick() {
@@ -62,6 +66,17 @@ function editClick() {
     loadAddrs();
 }
 
+function checkNotEmpty(someArray) {
+
+    if (someArray.length > 0) {
+        if (field != null) {
+            sortByAny(someArray);
+        } else {
+            displayArrayData(someArray);
+        }
+    }
+}
+
 async function editForm(id, known) {
     
     const name = document.getElementById("name"+id).value;
diff --git a/internal/web/public/js/sort.js b/internal/web/public/js/sort.js
index a145f9c..888b809 100644
--- a/internal/web/public/js/sort.js
+++ b/internal/web/public/js/sort.js
@@ -1,4 +1,5 @@
 var oldField = '';
+var field = '';
 
 function displayArrayData(someArray) {
     document.getElementById('tBody').innerHTML = "";
@@ -11,7 +12,7 @@ function displayArrayData(someArray) {
     }
 }
 
-function sortByAny(someArray, field) {
+function sortByAny(someArray) {
 
     if (field != oldField) {
         oldField = field;