diff --git a/src/core/Player.ts b/src/core/Player.ts
index 4c8648d1d..80ff265cd 100644
--- a/src/core/Player.ts
+++ b/src/core/Player.ts
@@ -186,8 +186,10 @@ export default class Player {
   async cache(cache?: ICache): Promise<void> {
     if (!cache) return;
 
-    const sig_buf = Buffer.from(LZW.compress(this.sig_sc));
-    const nsig_buf = Buffer.from(LZW.compress(this.nsig_sc));
+    const encoder = new TextEncoder();
+
+    const sig_buf = encoder.encode(LZW.compress(this.sig_sc));
+    const nsig_buf = encoder.encode(LZW.compress(this.nsig_sc));
 
     const buffer = new ArrayBuffer(12 + sig_buf.byteLength + nsig_buf.byteLength);
     const view = new DataView(buffer);
diff --git a/src/core/Session.ts b/src/core/Session.ts
index c21456df2..c021ea083 100644
--- a/src/core/Session.ts
+++ b/src/core/Session.ts
@@ -392,7 +392,7 @@ export default class Session extends EventEmitter {
 
     Log.info(TAG, 'Compressing and caching session data.');
 
-    const compressed_session_data = Buffer.from(LZW.compress(JSON.stringify(session_data)));
+    const compressed_session_data = new TextEncoder().encode(LZW.compress(JSON.stringify(session_data)));
 
     const buffer = new ArrayBuffer(4 + compressed_session_data.byteLength);
     new DataView(buffer).setUint32(0, compressed_session_data.byteLength, true); // (Luan) XX: Leave this here for debugging purposes