1 files changed, 1 insertions, 5 deletions
diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 0c0e4ef46..4bc41bd55 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -31,7 +31,6 @@ import io.netty.channel.socket.DatagramPacket;
 import io.netty.handler.timeout.IdleStateHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.traccar.config.Keys;
 import org.traccar.events.CommandResultEventHandler;
 import org.traccar.events.DriverEventHandler;
 import org.traccar.events.FuelDropEventHandler;
@@ -316,12 +315,9 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
             pipeline.addLast(new DefaultDataHandler());
         }
 
-        if (Context.getConfig().getBoolean(Keys.FORWARD_ENABLE)) {
-            pipeline.addLast(Main.getInjector().getInstance(WebDataHandler.class));
-        }
-
         addHandlers(
                 pipeline,
+                Main.getInjector().getInstance(WebDataHandler.class),
                 commandResultEventHandler,
                 overspeedEventHandler,
                 fuelDropEventHandler,