diff --git a/modules/runtime/src/main/java/org/atmosphere/container/JSR356AsyncSupport.java b/modules/runtime/src/main/java/org/atmosphere/container/JSR356AsyncSupport.java
index 504dda20fe6..606bd4cc3d6 100644
--- a/modules/runtime/src/main/java/org/atmosphere/container/JSR356AsyncSupport.java
+++ b/modules/runtime/src/main/java/org/atmosphere/container/JSR356AsyncSupport.java
@@ -74,17 +74,17 @@ public JSR356AsyncSupport(AtmosphereConfig config, ServletContext ctx) {
         // /servletPath
         // /servletPath/
         // /servletPath/{path1}
-        // /servletPath/{path1}/
         // /servletPath/{path1}/{path2}
         // etc with up to `pathLength` parameters 
 
         StringBuilder b = new StringBuilder(servletPath);
         List<String> endpointPaths = new ArrayList<>();
         endpointPaths.add(servletPath);
+        if (!servletPath.endsWith("/")) {
+            endpointPaths.add(servletPath+"/");
+        }
         for (int i = 0; i < pathLength; i++) {
-            b.append("/");
-            endpointPaths.add(b.toString());
-            b.append("{path" + i + "}");
+            b.append("/{path" + i + "}");
             endpointPaths.add(b.toString());
         }