diff --git a/src/js/document-blocked.js b/src/js/document-blocked.js
index 858f2d80d..746e03557 100644
--- a/src/js/document-blocked.js
+++ b/src/js/document-blocked.js
@@ -35,7 +35,7 @@ let details = {};
 {
     const matches = /details=([^&]+)/.exec(window.location.search);
     if ( matches !== null ) {
-        details = JSON.parse(atob(matches[1]));
+        details = JSON.parse(decodeURIComponent(matches[1]));
     }
 }
 
diff --git a/src/js/tab.js b/src/js/tab.js
index 1e30bdfbd..eeb19f554 100644
--- a/src/js/tab.js
+++ b/src/js/tab.js
@@ -311,7 +311,7 @@
         if ( targetURL.startsWith(vAPI.getURL('document-blocked.html')) ) {
             const matches = /details=([^&]+)/.exec(targetURL);
             if ( matches !== null ) {
-                targetURL = JSON.parse(atob(matches[1])).url;
+                targetURL = JSON.parse(decodeURIComponent(matches[1])).url;
             }
         }
 
diff --git a/src/js/traffic.js b/src/js/traffic.js
index 56da0a93d..9ce242120 100644
--- a/src/js/traffic.js
+++ b/src/js/traffic.js
@@ -217,7 +217,7 @@ const onBeforeRootFrameRequest = function(fctxt) {
     if ( logData === undefined  ) { return; }
 
     // Blocked
-    const query = btoa(JSON.stringify({
+    const query = encodeURIComponent(JSON.stringify({
         url: requestURL,
         hn: requestHostname,
         dn: fctxt.getDomain() || requestHostname,