diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/190_percentiles_hdr_metric.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/190_percentiles_hdr_metric.yml
index 32c349c5e46b6..fd7e17306abd9 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/190_percentiles_hdr_metric.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/190_percentiles_hdr_metric.yml
@@ -160,6 +160,16 @@ setup:
 ---
 "Filtered test":
 
+  - do:
+      bulk:
+        refresh: true
+        body:
+          - index:
+              _index: test_1
+              _id:    5
+          - int_field: 126
+            double_field: 126.0
+            string_field: foo
   - do:
       search:
         rest_total_hits_as_int: true
@@ -180,14 +190,14 @@ setup:
                 field: double_field
                 hdr: {}
 
-  - match: { hits.total: 3 }
-  - length: { hits.hits: 3 }
+  - match: { hits.total: 4 }
+  - length: { hits.hits: 4 }
 
   - match: { aggregations.percentiles_int.values.1\.0: 51.0 }
   - match: { aggregations.percentiles_int.values.5\.0: 51.0 }
   - match: { aggregations.percentiles_int.values.25\.0: 51.0 }
   - match: { aggregations.percentiles_int.values.50\.0: 101.03125 }
-  - match: { aggregations.percentiles_int.values.75\.0: 101.03125 }
+  - match: { aggregations.percentiles_int.values.75\.0: 126.03125 }
   - match: { aggregations.percentiles_int.values.95\.0: 151.09375 }
   - match: { aggregations.percentiles_int.values.99\.0: 151.09375 }
 
@@ -195,7 +205,7 @@ setup:
   - match: { aggregations.percentiles_double.values.5\.0: 51.0 }
   - match: { aggregations.percentiles_double.values.25\.0: 51.0 }
   - match: { aggregations.percentiles_double.values.50\.0: 101.03125 }
-  - match: { aggregations.percentiles_double.values.75\.0: 101.03125 }
+  - match: { aggregations.percentiles_double.values.75\.0: 126.03125 }
   - match: { aggregations.percentiles_double.values.95\.0: 151.09375 }
   - match: { aggregations.percentiles_double.values.99\.0: 151.09375 }
 
diff --git a/server/build.gradle b/server/build.gradle
index 45ec2300008f2..4490b2ea170cf 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -121,7 +121,7 @@ dependencies {
   // percentiles aggregation
   api 'com.tdunning:t-digest:3.2'
   // precentil ranks aggregation
-  api 'org.hdrhistogram:HdrHistogram:2.1.9'
+  api 'org.hdrhistogram:HdrHistogram:2.1.12'
 
   // lucene spatial
   api "org.locationtech.spatial4j:spatial4j:${versions.spatial4j}", optional
@@ -317,10 +317,6 @@ tasks.named("thirdPartyAudit").configure {
             'com.google.common.geometry.S2$Metric',
             'com.google.common.geometry.S2LatLng'
     )
-
-    if (BuildParams.runtimeJavaVersion > JavaVersion.VERSION_1_8) {
-        ignoreMissingClasses 'javax.xml.bind.DatatypeConverter'
-    }
 }
 
 tasks.named("dependencyLicenses").configure {
diff --git a/server/licenses/HdrHistogram-2.1.12.jar.sha1 b/server/licenses/HdrHistogram-2.1.12.jar.sha1
new file mode 100644
index 0000000000000..9d20fa0e5f22d
--- /dev/null
+++ b/server/licenses/HdrHistogram-2.1.12.jar.sha1
@@ -0,0 +1 @@
+6eb7552156e0d517ae80cc2247be1427c8d90452
\ No newline at end of file
diff --git a/server/licenses/HdrHistogram-2.1.9.jar.sha1 b/server/licenses/HdrHistogram-2.1.9.jar.sha1
deleted file mode 100644
index 2378df07b2c0c..0000000000000
--- a/server/licenses/HdrHistogram-2.1.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e4631ce165eb400edecfa32e03d3f1be53dee754
\ No newline at end of file