diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java
index 66ef34109..5abfecaf4 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java
@@ -22,7 +22,7 @@ import org.springframework.cloud.sleuth.Span;
 import org.springframework.cloud.sleuth.sampler.NeverSampler;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
-import org.springframework.messaging.MessageDeliveryException;
+import org.springframework.messaging.MessagingException;
 import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.support.GenericMessage;
 import org.springframework.messaging.support.MessageBuilder;
@@ -87,8 +87,8 @@ public class TraceChannelInterceptor extends AbstractTraceChannelInterceptor {
 
 	private Message getMessage(Message<?> message) {
 		Object payload = message.getPayload();
-		if (payload instanceof MessageDeliveryException) {
-			MessageDeliveryException e = (MessageDeliveryException) payload;
+		if (payload instanceof MessagingException) {
+			MessagingException e = (MessagingException) payload;
 			return e.getFailedMessage();
 		}
 		return message;
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java
index 4484b7618..275227bbf 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java
@@ -323,8 +323,8 @@ public class TraceChannelInterceptorTests implements MessageHandler {
 	}
 
 	@Test
-	public void workWithMessageDeliveryException() throws Exception {
-		Message<?> message = new GenericMessage<>(new MessageDeliveryException(
+	public void workWithMessagingException() throws Exception {
+		Message<?> message = new GenericMessage<>(new MessagingException(
 				MessageBuilder.withPayload("hi")
 						.setHeader(TraceMessageHeaders.TRACE_ID_NAME, Span.idToHex(10L))
 						.setHeader(TraceMessageHeaders.SPAN_ID_NAME, Span.idToHex(20L)).build()