diff --git a/assets/js/site.js b/assets/js/site.js
index 704fdd0..d9c459e 100644
--- a/assets/js/site.js
+++ b/assets/js/site.js
@@ -216,7 +216,11 @@ function setAllGraphVisibility(visible) {
     historyPlot.draw();
 
     // Update our localStorage
-    saveGraphControls(Object.keys(displayedGraphData));
+    if (visible) {
+        resetGraphControls();
+    } else {
+        saveGraphControls(Object.keys(displayedGraphData));
+    }
 }
 
 function toggleControlsDrawer() {
@@ -470,6 +474,10 @@ $(document).ready(function() {
         historyPlot.draw();
 
         // Update our localStorage
-        saveGraphControls(Object.keys(displayedGraphData));
+        if (Object.keys(hiddenGraphData).length === 0) {
+            resetGraphControls();
+        } else {
+            saveGraphControls(Object.keys(displayedGraphData));
+        }
     });
 });
diff --git a/assets/js/util.js b/assets/js/util.js
index 5b83b60..449effc 100644
--- a/assets/js/util.js
+++ b/assets/js/util.js
@@ -20,6 +20,12 @@ function loadGraphControls() {
 	}
 }
 
+function resetGraphControls() {
+	if (typeof(localStorage) !== undefined) {
+		localStorage.removeItem('displayedServers');
+	}
+}
+
 function getTimestamp(ms, timeOnly) {
     var date = new Date(0);