diff --git a/java/ql/src/semmle/code/java/frameworks/spring/SpringController.qll b/java/ql/src/semmle/code/java/frameworks/spring/SpringController.qll
index ca1ea2e1ce8..54849d2d64b 100644
--- a/java/ql/src/semmle/code/java/frameworks/spring/SpringController.qll
+++ b/java/ql/src/semmle/code/java/frameworks/spring/SpringController.qll
@@ -207,10 +207,7 @@ class SpringRequestMappingParameter extends Parameter {
     this.getAnAnnotation() instanceof SpringServletInputAnnotation or
     // HttpEntity is like @RequestBody, but with a wrapper including the headers
     // TODO model unwrapping aspects
-    getType()
-        .(RefType)
-        .getAnAncestor()
-        .hasQualifiedName("org.springframework.http", "HttpEntity<T>") or
+    getType().(RefType).getASourceSupertype*() instanceof SpringHttpEntity or
     this
         .getAnAnnotation()
         .getType()