diff --git a/profiles/killbill/src/main/java/org/killbill/billing/server/security/TenantFilter.java b/profiles/killbill/src/main/java/org/killbill/billing/server/security/TenantFilter.java
index 97e2bed..82f63d1 100644
--- a/profiles/killbill/src/main/java/org/killbill/billing/server/security/TenantFilter.java
+++ b/profiles/killbill/src/main/java/org/killbill/billing/server/security/TenantFilter.java
@@ -134,8 +134,7 @@ public class TenantFilter implements Filter {
if (request instanceof HttpServletRequest) {
final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
- // TODO Wrong - See https://github.com/killbill/killbill/issues/221
- final String path = httpServletRequest.getRequestURI();
+ final String path = httpServletRequest.getPathInfo();
final String httpMethod = httpServletRequest.getMethod();
if ( // Chicken - egg problem
isTenantCreationRequest(path, httpMethod) ||
