diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 47d9793cc..fa59ba2b5 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -63,7 +63,7 @@ const parsedInitialResults = () => {
 
 const decodeUTF8Base64 = (data) => {
   const rawData = atob(data)
-  const array = Uint8Array.from([...rawData].map((char) => char.charCodeAt(0)))
+  const array = Uint8Array.from([...rawData].map((char) => char.codePointAt(0)))
   const text = new TextDecoder().decode(array)
   return text
 }
diff --git a/src/services/sw/sw.js b/src/services/sw/sw.js
index e744e37aa..b45409b28 100644
--- a/src/services/sw/sw.js
+++ b/src/services/sw/sw.js
@@ -4,7 +4,7 @@ function urlBase64ToUint8Array(base64String) {
   const base64 = (base64String + padding).replace(/-/g, '+').replace(/_/g, '/')
 
   const rawData = window.atob(base64)
-  return Uint8Array.from([...rawData].map((char) => char.charCodeAt(0)))
+  return Uint8Array.from([...rawData].map((char) => char.codePointAt(0)))
 }
 
 export function isSWSupported() {