2 files changed, 2 insertions, 7 deletions
diff --git a/src/org/traccar/protocol/WatchProtocol.java b/src/org/traccar/protocol/WatchProtocol.java
index 07a146572..b8c990b84 100644
--- a/src/org/traccar/protocol/WatchProtocol.java
+++ b/src/org/traccar/protocol/WatchProtocol.java
@@ -20,10 +20,6 @@ import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 import org.traccar.model.Command;
 
-import io.netty.handler.codec.string.StringEncoder;
-
-import java.nio.charset.StandardCharsets;
-
 public class WatchProtocol extends BaseProtocol {
 
     public WatchProtocol() {
@@ -47,7 +43,6 @@ public class WatchProtocol extends BaseProtocol {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new WatchFrameDecoder());
-                pipeline.addLast(new StringEncoder(StandardCharsets.ISO_8859_1));
                 pipeline.addLast(new WatchProtocolEncoder());
                 pipeline.addLast(new WatchProtocolDecoder(WatchProtocol.this));
             }
diff --git a/src/org/traccar/protocol/WatchProtocolEncoder.java b/src/org/traccar/protocol/WatchProtocolEncoder.java
index 8048d30ff..df29d83a9 100644
--- a/src/org/traccar/protocol/WatchProtocolEncoder.java
+++ b/src/org/traccar/protocol/WatchProtocolEncoder.java
@@ -47,11 +47,11 @@ public class WatchProtocolEncoder extends StringProtocolEncoder implements Strin
         return null;
     }
 
-    protected String formatTextCommand(Channel channel, Command command, String format, String... keys) {
+    protected ByteBuf formatTextCommand(Channel channel, Command command, String format, String... keys) {
         String content = formatCommand(command, format, this, keys);
         ByteBuf buf = Unpooled.copiedBuffer(content, StandardCharsets.US_ASCII);
 
-        return formatBinaryCommand(channel, command, "", buf).toString(StandardCharsets.US_ASCII);
+        return formatBinaryCommand(channel, command, "", buf);
     }
 
     protected ByteBuf formatBinaryCommand(Channel channel, Command command, String textPrefix, ByteBuf data) {