diff --git a/queue/listener.go b/queue/listener.go
index ad891d8a..ede674f6 100644
--- a/queue/listener.go
+++ b/queue/listener.go
@@ -74,8 +74,8 @@ func (l *listener) Listen(ctx context.Context, ch <-chan *message.Message) {
 
 	go func() {
 		l.wg.Wait()
-		close(l.done)
 		l.logger.Infof("queue listener closed")
+		close(l.done)
 	}()
 	return
 }
@@ -115,11 +115,14 @@ func (l *listener) startWorker(ctx context.Context, messages <-chan *message.Mes
 }
 
 func (l *listener) handleMessage(ctx context.Context, msg *message.Message) {
-	l.logger.WithField("message_uuid", msg.UUID).Debugf("queue listener handling message")
 	ctx = otel.GetTextMapPropagator().Extract(ctx, propagation.MapCarrier(msg.Metadata))
+	logger := l.logger.WithContext(ctx)
+	ctx = logging.ContextWithLogger(ctx, logger)
+
+	logger.WithField("message_uuid", msg.UUID).Debugf("queue listener handling message")
 	err := l.callbackFn(ctx, msg.Metadata, msg.Payload)
 	if err != nil {
-		l.logger.WithField("message_uuid", msg.UUID).WithField("err", err.Error()).Errorf("queue listener failed to process message")
+		logger.WithField("message_uuid", msg.UUID).WithField("err", err.Error()).Errorf("queue listener failed to process message")
 		msg.Nack()
 		return
 	}
diff --git a/queue/listener_test.go b/queue/listener_test.go
index 1efa2672..765b6318 100644
--- a/queue/listener_test.go
+++ b/queue/listener_test.go
@@ -1,12 +1,19 @@
 package queue_test
 
 import (
+	"bytes"
 	"context" //nolint: gosec
+	"fmt"
 	"os"
 	"testing"
 
+	"github.com/ThreeDotsLabs/watermill/message"
+	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/propagation"
+	"go.opentelemetry.io/otel/trace"
 
 	"github.com/formancehq/go-libs/v4/logging"
 	"github.com/formancehq/go-libs/v4/queue"
@@ -27,3 +34,51 @@ func TestNewListenerInvalidCallback(t *testing.T) {
 	assert.ErrorContains(t, err, "callback")
 	assert.Nil(t, listener)
 }
+
+func TestHandleMessageInjectsLoggerAndPropagatesTraceContext(t *testing.T) {
+	// Register W3C TraceContext propagator so Extract parses traceparent from metadata
+	otel.SetTextMapPropagator(propagation.TraceContext{})
+
+	var buf bytes.Buffer
+	l := logrus.New()
+	l.SetOutput(&buf)
+	l.SetLevel(logrus.DebugLevel)
+	logger := logging.NewLogrus(l)
+
+	expectedTraceID := "4bf92f3577b16e0f0e3dd97b8142ec4a"
+	expectedSpanID := "00f067aa0ba902b7"
+
+	done := make(chan struct{})
+	callback := func(ctx context.Context, meta map[string]string, msg []byte) error {
+		// Verify logger injection: logging.FromContext(ctx) should return our buffered logger
+		logging.FromContext(ctx).Infof("hello from callback")
+
+		// Verify trace propagation: Extract() should populate ctx with trace/span from metadata
+		sc := trace.SpanFromContext(ctx).SpanContext()
+		logging.FromContext(ctx).Infof(
+			fmt.Sprintf("trace_id=%s span_id=%s", sc.TraceID().String(), sc.SpanID().String()),
+		)
+		close(done)
+		return nil
+	}
+
+	listener, err := queue.NewListener(logger, callback, 1)
+	require.NoError(t, err)
+
+	ch := make(chan *message.Message, 1)
+	msg := message.NewMessage("test-uuid", []byte("test-payload"))
+	msg.Metadata["traceparent"] = "00-" + expectedTraceID + "-" + expectedSpanID + "-01"
+	ch <- msg
+
+	ctx, cancel := context.WithCancel(context.Background())
+	listener.Listen(ctx, ch)
+
+	<-done
+	cancel()
+	<-listener.Done()
+
+	output := buf.String()
+	assert.Contains(t, output, "hello from callback", "logger should be injected into context")
+	assert.Contains(t, output, expectedTraceID, "trace ID should be propagated from message metadata via Extract")
+	assert.Contains(t, output, expectedSpanID, "span ID should be propagated from message metadata via Extract")
+}