diff --git a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
index a8ad14570a..30190c4926 100644
--- a/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
+++ b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
@@ -1043,11 +1043,12 @@ public class DefaultChannelPipeline implements ChannelPipeline {
      * in {@link ChannelInboundHandler#channelRead(ChannelHandlerContext, Object)}. This method is responsible
      * to call {@link ReferenceCountUtil#release(Object)} on the given msg at some point.
      */
-    protected void onUnhandledInboundMessage(Object msg) {
+    protected void onUnhandledInboundMessage(ChannelHandlerContext ctx, Object msg) {
         try {
             logger.debug(
                     "Discarded inbound message {} that reached at the tail of the pipeline. " +
-                            "Please check your pipeline configuration.", msg);
+                            "Please check your pipeline configuration. Discarded message pipeline : {}. Channel : {}.",
+                    msg, ctx.pipeline().names(), ctx.channel());
         } finally {
             ReferenceCountUtil.release(msg);
         }
@@ -1136,7 +1137,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
 
         @Override
         public void channelRead(ChannelHandlerContext ctx, Object msg) {
-            ((DefaultChannelPipeline) ctx.pipeline()).onUnhandledInboundMessage(msg);
+            ((DefaultChannelPipeline) ctx.pipeline()).onUnhandledInboundMessage(ctx, msg);
         }
 
         @Override
diff --git a/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java b/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java
index d20ebe9df9..b16b07d637 100644
--- a/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java
+++ b/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java
@@ -28,6 +28,7 @@ import io.netty.channel.ChannelConfig;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelId;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelMetadata;
@@ -870,7 +871,7 @@ public class EmbeddedChannel extends AbstractChannel {
         }
 
         @Override
-        protected void onUnhandledInboundMessage(Object msg) {
+        protected void onUnhandledInboundMessage(ChannelHandlerContext ctx, Object msg) {
           handleInboundMessage(msg);
         }
     }
diff --git a/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTailTest.java b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTailTest.java
index bedc64e167..a8a3c3e79e 100644
--- a/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTailTest.java
+++ b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTailTest.java
@@ -313,7 +313,7 @@ public class DefaultChannelPipelineTailTest {
             }
 
             @Override
-            protected void onUnhandledInboundMessage(Object msg) {
+            protected void onUnhandledInboundMessage(ChannelHandlerContext ctx, Object msg) {
                 MyChannel.this.onUnhandledInboundMessage(msg);
             }