diff --git a/elasticsearch5/src/main/java/com/yahoo/ycsb/db/elasticsearch5/ElasticsearchClient.java b/elasticsearch5/src/main/java/com/yahoo/ycsb/db/elasticsearch5/ElasticsearchClient.java
index d6a77bd35b2fa984cf87fcc90a94465475e6663e..aecee472f6e9b2e26d12021158d7c71aa6bf6ffc 100644
--- a/elasticsearch5/src/main/java/com/yahoo/ycsb/db/elasticsearch5/ElasticsearchClient.java
+++ b/elasticsearch5/src/main/java/com/yahoo/ycsb/db/elasticsearch5/ElasticsearchClient.java
@@ -150,8 +150,7 @@ public class ElasticsearchClient extends DB {
 
   @Override
   public Status insert(String table, String key, Map<String, ByteIterator> values) {
-    try {
-      final XContentBuilder doc = jsonBuilder();
+    try (XContentBuilder doc = jsonBuilder()) {
 
       doc.startObject();
       for (final Entry<String, String> entry : StringByteIterator.getStringMap(values).entrySet()) {