diff --git a/omod/src/main/java/org/openmrs/module/fhir2/web/filter/ForwardingFilter.java b/omod/src/main/java/org/openmrs/module/fhir2/web/filter/ForwardingFilter.java
index 0ffe42107..d37c7f5da 100644
--- a/omod/src/main/java/org/openmrs/module/fhir2/web/filter/ForwardingFilter.java
+++ b/omod/src/main/java/org/openmrs/module/fhir2/web/filter/ForwardingFilter.java
@@ -31,9 +31,9 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
String requestURI = request.getRequestURI();
String contextPath = ((HttpServletRequest) req).getContextPath();
- String prefix = contextPath + "/ws/fhir2/";
+ String prefix = contextPath + "/ws/fhir2";
if (requestURI.startsWith(prefix)) {
- String newURI = requestURI.replace(prefix, "/ms/fhir2Servlet/");
+ String newURI = requestURI.replace(prefix, "/ms/fhir2Servlet");
req.getRequestDispatcher(newURI).forward(req, res);
} else {
chain.doFilter(req, res);
diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml
index a3198771d..4a83be71d 100644
--- a/omod/src/main/resources/config.xml
+++ b/omod/src/main/resources/config.xml
@@ -56,7 +56,9 @@
fhir2AuthenticationFilter
+ /ws/fhir2
/ws/fhir2/*
+ /ms/fhir2Servlet
/ms/fhir2Servlet/*
@@ -65,6 +67,7 @@
fhir2ForwardingFilter
+ /ws/fhir2
/ws/fhir2/*