diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchAutoConfiguration.java
index 51931ec1cc2..094edf9b367 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchAutoConfiguration.java
@@ -100,16 +100,14 @@ public class ElasticsearchAutoConfiguration implements DisposableBean {
 				if (logger.isInfoEnabled()) {
 					logger.info("Closing Elasticsearch client");
 				}
-				if (this.releasable != null) {
-					try {
-						this.releasable.close();
-					}
-					catch (NoSuchMethodError ex) {
-						// Earlier versions of Elasticsearch had a different method name
-						ReflectionUtils.invokeMethod(
-								ReflectionUtils.findMethod(Releasable.class, "release"),
-								this.releasable);
-					}
+				try {
+					this.releasable.close();
+				}
+				catch (NoSuchMethodError ex) {
+					// Earlier versions of Elasticsearch had a different method name
+					ReflectionUtils.invokeMethod(
+							ReflectionUtils.findMethod(Releasable.class, "release"),
+							this.releasable);
 				}
 			}
 			catch (final Exception ex) {