2 files changed, 8 insertions, 4 deletions
diff --git a/src/org/traccar/api/SecurityRequestFilter.java b/src/org/traccar/api/SecurityRequestFilter.java
index 5f4d2332f..3563cbf77 100644
--- a/src/org/traccar/api/SecurityRequestFilter.java
+++ b/src/org/traccar/api/SecurityRequestFilter.java
@@ -16,6 +16,7 @@
 package org.traccar.api;
 
 import org.traccar.Context;
+import org.traccar.api.resource.ServerResource;
 import org.traccar.api.resource.SessionResource;
 import org.traccar.model.User;
 
@@ -50,8 +51,10 @@ public class SecurityRequestFilter implements ContainerRequestFilter {
 
     @Override
     public void filter(ContainerRequestContext requestContext) {
+        String path = requestContext.getUriInfo().getPath();
+        String serverPath = ServerResource.class.getAnnotation(Path.class).value();
         String sessionPath = SessionResource.class.getAnnotation(Path.class).value();
-        if (sessionPath.equals(requestContext.getUriInfo().getPath())) {
+        if (serverPath.equals(path) || sessionPath.equals(path)) {
             return;
         }
 
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index 82a695e96..85be02e4a 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -64,10 +64,10 @@ public class WebServer {
                 break;
             case "old":
                 initOldApi();
-                initRestApi();
                 initOldWebApp();
                 break;
             default:
+                initOldApi();
                 initRestApi();
                 if (config.getBoolean("web.console")) {
                     initConsole();
@@ -130,9 +130,10 @@ public class WebServer {
         resourceConfig.register(CorsResponseFilter.class);
         resourceConfig.registerClasses(
                 ServerResource.class, SessionResource.class, DeviceResource.class, UserResource.class);
+
         ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
-        ServletHolder servletHolder = new ServletHolder(new ServletContainer(resourceConfig));
-        servletHandler.addServlet(servletHolder, "/rest/*");
+        servletHandler.setContextPath("/rest");
+        servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/*");
         handlers.addHandler(servletHandler);
     }