diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87d1ef96bf..7700287009 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Removed
 
 ### Fixed
+ - [BUG] JarHell caused by latest software.amazon.awssdk 2.20.141 ([#616](https://github.com/opensearch-project/opensearch-java/pull/616))
 
 ### Security
 
diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts
index c1cd4a7187..506ac20046 100644
--- a/java-client/build.gradle.kts
+++ b/java-client/build.gradle.kts
@@ -55,6 +55,12 @@ plugins {
 }
 apply(plugin = "opensearch.repositories")
 
+configurations {
+    all {
+        exclude(group = "software.amazon.awssdk", module = "third-party-jackson-core")
+    }
+}
+
 checkstyle {
     toolVersion = "10.0"
 }
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCatClientIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCatClientIT.java
index 7c6b1cdee5..7fe7ae8985 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCatClientIT.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCatClientIT.java
@@ -242,7 +242,7 @@ public void testCatPitSegments() throws Exception {
 
         assertNotNull("PitSegmentsResponse.segments() is null", PitSegmentsResponse.valueBody());
         assertTrue("PitSegmentsResponse.segments().size() == 0",
-                PitSegmentsResponse.valueBody().size() > 0);
+                PitSegmentsResponse.valueBody().isEmpty());
         }
 
     private void createIndex(String indexName) throws Exception {