diff --git a/web/js/main.js b/web/js/main.js
index 6186273..88fd336 100644
--- a/web/js/main.js
+++ b/web/js/main.js
@@ -709,7 +709,7 @@ const updateDataElements = throttle(function(parsedData) {
     $commandInput.attr("aria-label", "Current frequency: " + parsedData.freq);
     updateHtmlIfChanged($dataPi, parsedData.pi === '?' ? "<span class='opacity-half'>?</span>" : parsedData.pi);
 
-    if (localStorage.getItem('psUnderscores') === 'true') {
+    if ($('#ps-underscores').is(':checked')) {
         parsedData.ps = parsedData.ps.replace(/\s/g, '_');
     }
     updateHtmlIfChanged($dataPs, parsedData.ps === '?' ? "<span class='opacity-half'>?</span>" : processString(parsedData.ps, parsedData.ps_errors));
diff --git a/web/js/settings.js b/web/js/settings.js
index c9e2680..e2cc5b7 100644
--- a/web/js/settings.js
+++ b/web/js/settings.js
@@ -58,7 +58,6 @@ $(document).ready(() => {
     const signalParameter = getQueryParameter('signalUnits');
     if(signalParameter) {
         signalSelector.find('input').val($(signalParameter).text());
-        localStorage.setItem('signalUnit', signalParameter);
     }
 
     if (localStorage.getItem('signalUnit')) {
@@ -137,13 +136,13 @@ $(document).ready(() => {
     
     const psUnderscoreParameter = getQueryParameter('psUnderscores');
     if(psUnderscoreParameter) {
-        $("#ps-underscores").prop("checked", psUnderscoreParameter);
-        localStorage.setItem("psUnderscores", psUnderscoreParameter);
+        console.log(psUnderscoreParameter);
+        $("#ps-underscores").prop("checked", JSON.parse(psUnderscoreParameter));
     }
     
     var psUnderscores = localStorage.getItem("psUnderscores");
     if (psUnderscores) {
-        $("#ps-underscores").prop("checked", psUnderscores);
+        $("#ps-underscores").prop("checked", JSON.parse(psUnderscoreParameter));
         localStorage.setItem("psUnderscores", psUnderscores);
     }