diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml
index d2486dcf8086..390bdb13b233 100644
--- a/container/features/src/main/resources/features.xml
+++ b/container/features/src/main/resources/features.xml
@@ -188,10 +188,13 @@
     </feature>
     <feature name="owasp-html-sanitizer" version="${owaspHtmlSanitizerVersion}" description="OWASP :: HTML Sanitizer">
         <feature version="${guavaOsgiVersion}">guava</feature>
-        <bundle>mvn:com.google.code.findbugs/jsr305/3.0.2</bundle>
+        <!--
+        <bundle>mvn:com.google.code.findbugs/jsr305/${findbugsJsr305Version}</bundle>
+        <bundle>mvn:com.google.code.findbugs/annotations/${findbugsAnnotationsVersion}</bundle>
         <bundle>wrap:mvn:com.googlecode.owasp-java-html-sanitizer/java8-shim/${owaspHtmlSanitizerVersion}</bundle>
         <bundle>wrap:mvn:com.googlecode.owasp-java-html-sanitizer/java10-shim/${owaspHtmlSanitizerVersion}</bundle>
-        <bundle>mvn:com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer/${owaspHtmlSanitizerVersion}</bundle>
+        -->
+        <bundle>wrap:mvn:com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer/${owaspHtmlSanitizerVersion}$overwrite=merge&amp;Import-Package=javax.annotation;version=!,*</bundle>
     </feature>
     <feature name="postgresql" version="${postgresqlVersion}" description="PostgreSQL :: JDBC Driver">
         <feature>pax-jdbc-spec</feature>
diff --git a/pom.xml b/pom.xml
index f0919637961c..c59366867514 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1799,7 +1799,7 @@
     <osgiCompendiumVersion>7.0.0</osgiCompendiumVersion>
     <osgiEnterpriseVersion>7.0.0</osgiEnterpriseVersion>
     <owaspEncoderVersion>1.2.3</owaspEncoderVersion>
-    <owaspHtmlSanitizerVersion>20240325.1</owaspHtmlSanitizerVersion>
+    <owaspHtmlSanitizerVersion>20211018.2</owaspHtmlSanitizerVersion>
     <osgiJaxRsVersion>1.1.0.ONMS</osgiJaxRsVersion>
     <osMavenPluginVersion>1.7.1</osMavenPluginVersion>
     <opencsvVersion>2.3</opencsvVersion>