diff --git a/Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionEncoder.java b/Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionEncoder.java
index b392f18..152a525 100644
--- a/Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionEncoder.java
+++ b/Havana-Server/src/main/java/org/alexdev/havana/server/netty/codec/EncryptionEncoder.java
@@ -39,7 +39,7 @@ public class EncryptionEncoder extends MessageToMessageEncoder<ByteBuf> {
         byte[] tOriginalMsgBytes = new byte[buffer.readableBytes()];
         buffer.readBytes(tOriginalMsgBytes);
 
-        String tOriginalMsg = new String(tOriginalMsgBytes);
+        String tOriginalMsg = new String(tOriginalMsgBytes, StringUtil.getCharset());
 
         String tHeader;
         String tMsg;
@@ -57,9 +57,9 @@ public class EncryptionEncoder extends MessageToMessageEncoder<ByteBuf> {
 
         var tEncryptedMsg = Unpooled.buffer();
 
-        tEncryptedMsg.writeBytes(tHeader.getBytes());
-        tEncryptedMsg.writeBytes(tMsg.getBytes());
+        tEncryptedMsg.writeBytes(tHeader.getBytes(StringUtil.getCharset()));
+        tEncryptedMsg.writeBytes(tMsg.getBytes(StringUtil.getCharset()));
 
         out.add(tEncryptedMsg);
     }
-}
\ No newline at end of file
+}