diff --git a/www/assets/js/track.js b/www/assets/js/track.js
index 6a577d5..997761c 100644
--- a/www/assets/js/track.js
+++ b/www/assets/js/track.js
@@ -16,11 +16,19 @@ function openTrackingInfoPage(code) {
 function addTrackingSuggestions() {
     $("#tracking-history-list ul").html("");
     var history = getTrackingHistory();
-    for (var i = history.length - 1; i >= 0; i--) {
-        $("#tracking-history-list ul").append('<li><a class="item-link item-content hapticbtn" href="/track/' + history[i] + '">'
+    if (history == false || history.length == 0) {
+        $("#tracking-history-list ul").append('<li class="item-content">'
                 + '<div class="item-inner"><div class="item-title">'
-                + history[i]
-                + '</div></div></a></li>');
+                + "You haven't tracked anything yet."
+                + '</div></div></li>');
+        $("#tracking-history-list ul").html('<li class="item-content"><div class="item-inner justify-content-center"><div class="item-title">You haven\'t tracked anything yet.</div></div></li>');
+    } else {
+        for (var i = history.length - 1; i >= 0; i--) {
+            $("#tracking-history-list ul").append('<li><a class="item-link item-content hapticbtn" href="/track/' + history[i] + '">'
+                    + '<div class="item-inner"><div class="item-title">'
+                    + history[i]
+                    + '</div></div></a></li>');
+        }
     }
     if (inStorage("accountkey") && inStorage("accountnumber")) {
         apirequest(SETTINGS.apis.gettrackingnumbers, {