diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java
index 62219e0..d5e3a85 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/tracker/ServletContextHelperTracker.java
@@ -24,7 +24,6 @@
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.http.context.ServletContextHelper;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
 import org.osgi.util.tracker.ServiceTracker;
 
 /**
@@ -40,10 +39,8 @@
     {
         try
         {
-            return btx.createFilter(String.format("(&(objectClass=%s)(%s=*)(%s=*))",
-                    ServletContextHelper.class.getName(),
-                    HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME,
-                    HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH));
+            return btx.createFilter(String.format("(objectClass=%s)",
+                    ServletContextHelper.class.getName()));
         }
         catch ( final InvalidSyntaxException ise)
         {