diff --git a/static/app-strings.json b/static/app-strings.json
index 744f7bfcb..01532b8df 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -929,4 +929,4 @@
   "Use custom wallet servers": "Use custom wallet servers",
   "Remove custom wallet server": "Remove custom wallet server",
   "Add": "Add"
-}
\ No newline at end of file
+}
diff --git a/ui/i18n.js b/ui/i18n.js
index de217cc12..dde2402ce 100644
--- a/ui/i18n.js
+++ b/ui/i18n.js
@@ -59,6 +59,6 @@ export function __(message, tokens) {
   }
 
   return translatedMessage.replace(/%([^%]+)%/g, function($1, $2) {
-    return tokens[$2] || $2;
+    return tokens.hasOwnProperty($2) ? tokens[$2] : $2;
   });
 }