1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/WialonProtocol.java b/src/main/java/org/traccar/protocol/WialonProtocol.java
index 3838791a7..2eac58a3e 100644
--- a/src/main/java/org/traccar/protocol/WialonProtocol.java
+++ b/src/main/java/org/traccar/protocol/WialonProtocol.java
@@ -38,11 +38,12 @@ public class WialonProtocol extends BaseProtocol {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new LineBasedFrameDecoder(4 * 1024));
-                pipeline.addLast(new StringEncoder());
                 boolean utf8 = Context.getConfig().getBoolean(getName() + ".utf8");
                 if (utf8) {
+                    pipeline.addLast(new StringEncoder(StandardCharsets.UTF_8));
                     pipeline.addLast(new StringDecoder(StandardCharsets.UTF_8));
                 } else {
+                    pipeline.addLast(new StringEncoder());
                     pipeline.addLast(new StringDecoder());
                 }
                 pipeline.addLast(new WialonProtocolEncoder(WialonProtocol.this));