diff --git a/src/Utils/crypto.ts b/src/Utils/crypto.ts
index de3985d3..9152b01f 100644
--- a/src/Utils/crypto.ts
+++ b/src/Utils/crypto.ts
@@ -100,7 +100,7 @@ export function aesEncrypt(buffer: Buffer | Uint8Array, key: Uint8Array) {
 }
 
 // encrypt AES 256 CBC with a given IV
-export function aesEncrypWithIV(buffer: Buffer, key: Buffer, IV: Buffer) {
+export function aesEncrypWithIV(buffer: Buffer | Uint8Array, key: Uint8Array, IV: Uint8Array) {
 	const aes = createCipheriv('aes-256-cbc', key, IV)
 	return Buffer.concat([aes.update(buffer), aes.final()]) // prefix IV to the buffer
 }
diff --git a/src/Utils/noise-handler.ts b/src/Utils/noise-handler.ts
index b0fee3e9..f8a36c76 100644
--- a/src/Utils/noise-handler.ts
+++ b/src/Utils/noise-handler.ts
@@ -123,9 +123,9 @@ export const makeNoiseHandler = ({
 
 	const mixIntoKey = (data: Uint8Array) => {
 		const [write, read] = localHKDF(data)
-		salt = write as Buffer
-		encKey = read as Buffer
-		decKey = read as Buffer
+		salt = Buffer.from(write)
+		encKey = Buffer.from(read)
+		decKey = Buffer.from(read)
 		counter = 0
 	}