diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java
index 3996640aea..cf05e8c49c 100644
--- a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java
@@ -344,10 +344,7 @@ public class DefaultHttpHeaderMapper implements HeaderMapper<HttpHeaders>, BeanF
 	}
 	
 	public void afterPropertiesSet() throws Exception {
-		if (this.beanFactory != null && this.beanFactory instanceof DefaultListableBeanFactory){
-			
-			this.conversionService = IntegrationContextUtils.getConversionService(this.beanFactory);
-		}
+		this.conversionService = IntegrationContextUtils.getConversionService(this.beanFactory);
 	}
 
 	private boolean containsElementIgnoreCase(String[] headerNames, String name){