diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java
index f65f009019d..c018a2e29bb 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java
@@ -71,6 +71,9 @@ public class IncomingRequestAddressStrategy implements IServerAddressStrategy {
 		} else {
 			//servletContextPath can start with servletPath 
 			contextIndex = requestUrl.indexOf(servletPath + "/", startOfPath);
+			if (contextIndex == -1) {
+				contextIndex = requestUrl.indexOf(servletPath, startOfPath);
+			}
 		}
 
 		String fhirServerBase;