diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java
index fe75788b4c..954652303d 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java
@@ -45,9 +45,9 @@ public abstract class AbstractMessageProcessor implements MessageProcessor {
 
 	protected Object evaluateExpression(Expression expression, Message<?> message, Class<?> expectedType) {
 		try {
-			return (expectedType != null && expectedType != void.class)
-				? expression.getValue(this.evaluationContext, message, expectedType)
-				: expression.getValue(this.evaluationContext, message);
+			return (expectedType != null)
+					? expression.getValue(this.evaluationContext, message, expectedType)
+					: expression.getValue(this.evaluationContext, message);
 		}
 		catch (EvaluationException e) {
 			Throwable cause = e.getCause();