diff --git a/src/plugins/GreaseMonkey/data/values.js b/src/plugins/GreaseMonkey/data/values.js
index e7a6756f..f035a062 100644
--- a/src/plugins/GreaseMonkey/data/values.js
+++ b/src/plugins/GreaseMonkey/data/values.js
@@ -1,112 +1,112 @@
 // Modified from https://gist.githubusercontent.com/arantius/3123124/raw/grant-none-shim.js
 //
 // %1 - unique script id
 
 function GM_deleteValue(aKey) {
     localStorage.removeItem("%1" + aKey);
 }
 
 function GM_getValue(aKey, aDefault) {
     var val = localStorage.getItem("%1" + aKey)
-    if (null === val && 'undefined' != typeof aDefault) return aDefault;
+    if (null === val) return aDefault;
     return val;
 }
 
 function GM_listValues() {
     var values = [];
     for (var i = 0; i < localStorage.length; i++) {
         var k = localStorage.key(i);
         if (k.indexOf("%1") === 0) {
             values.push(k.replace("%1", ""));
         }
     }
     return values;
 }
 
 function GM_setValue(aKey, aVal) {
     localStorage.setItem("%1" + aKey, aVal);
 }
 
 // GreaseMonkey 4.0 support
 var asyncCall = (func) => {
     if (window._falkon_external) {
         func();
     } else {
         document.addEventListener("_falkon_external_created", func);
     }
 };
 
 var decode = (val) => {
     val = String(val);
     if (!val.length) {
         return val;
     }
     var v = val.substr(1);
     if (val[0] == "b") {
         return Boolean(v == "true" ? true : false);
     } else if (val[0] == "i") {
         return Number(v);
     } else if (val[0] == "s") {
         return v;
     } else {
         return undefined;
     }
 };
 
 var encode = (val) => {
     if (typeof val == "boolean") {
         return "b" + (val ? "true" : "false");
     } else if (typeof val == "number") {
         return "i" + String(val);
     } else if (typeof val == "string") {
         return "s" + val;
     } else {
         return "";
     }
 };
 
 GM.deleteValue = function(name) {
     return new Promise((resolve, reject) => {
         asyncCall(() => {
             external.extra.greasemonkey.deleteValue("%1", name, (res) => {
                 if (res) {
                     resolve();
                 } else {
                     reject();
                 }
             });
         });
     });
 };
 
 GM.getValue = function(name, value) {
     return new Promise((resolve) => {
         asyncCall(() => {
             external.extra.greasemonkey.getValue("%1", name, encode(value), (res) => {
                 resolve(decode(res));
             });
         });
     });
 };
 
 GM.setValue = function(name, value) {
     return new Promise((resolve, reject) => {
         asyncCall(() => {
             external.extra.greasemonkey.setValue("%1", name, encode(value), (res) => {
                 if (res) {
                     resolve();
                 } else {
                     reject();
                 }
             });
         });
     });
 };
 
 GM.listValues = function() {
     return new Promise((resolve) => {
         asyncCall(() => {
             external.extra.greasemonkey.listValues("%1", resolve);
         });
     });
 };
diff --git a/src/plugins/GreaseMonkey/data/values.min.js b/src/plugins/GreaseMonkey/data/values.min.js
index a2650491..a69b4c7d 100644
--- a/src/plugins/GreaseMonkey/data/values.min.js
+++ b/src/plugins/GreaseMonkey/data/values.min.js
@@ -1,4 +1,4 @@
-function GM_deleteValue(a){localStorage.removeItem("%1"+a)}function GM_getValue(a,b){var c=localStorage.getItem("%1"+a);return null===c&&"undefined"!=typeof b?b:c}function GM_listValues(){for(var a=[],b=0;b<localStorage.length;b++){var c=localStorage.key(b);0===c.indexOf("%1")&&a.push(c.replace("%1",""))}return a}function GM_setValue(a,b){localStorage.setItem("%1"+a,b)}
+function GM_deleteValue(a){localStorage.removeItem("%1"+a)}function GM_getValue(a,b){var c=localStorage.getItem("%1"+a);return null===c?b:c}function GM_listValues(){for(var a=[],b=0;b<localStorage.length;b++){var c=localStorage.key(b);0===c.indexOf("%1")&&a.push(c.replace("%1",""))}return a}function GM_setValue(a,b){localStorage.setItem("%1"+a,b)}
 var asyncCall=function(a){window._falkon_external?a():document.addEventListener("_falkon_external_created",a)},decode=function(a){a=String(a);if(!a.length)return a;var b=a.substr(1);if("b"==a[0])return"true"==b?!0:!1;if("i"==a[0])return Number(b);if("s"==a[0])return b},encode=function(a){return"boolean"==typeof a?"b"+(a?"true":"false"):"number"==typeof a?"i"+String(a):"string"==typeof a?"s"+a:""};
 GM.deleteValue=function(a){return new Promise(function(b,c){asyncCall(function(){external.extra.greasemonkey.deleteValue("%1",a,function(a){a?b():c()})})})};GM.getValue=function(a,b){return new Promise(function(c){asyncCall(function(){external.extra.greasemonkey.getValue("%1",a,encode(b),function(a){c(decode(a))})})})};GM.setValue=function(a,b){return new Promise(function(c,d){asyncCall(function(){external.extra.greasemonkey.setValue("%1",a,encode(b),function(a){a?c():d()})})})};
 GM.listValues=function(){return new Promise(function(a){asyncCall(function(){external.extra.greasemonkey.listValues("%1",a)})})};