diff --git a/VERSION b/VERSION
index 2d6c0bc..ab0fa33 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.0.4
+5.0.5
diff --git a/pkg/kafka/kafka_inter_container_library.go b/pkg/kafka/kafka_inter_container_library.go
index 94e828b..120ed45 100644
--- a/pkg/kafka/kafka_inter_container_library.go
+++ b/pkg/kafka/kafka_inter_container_library.go
@@ -321,7 +321,7 @@
 		// if both log correlation and trace publishing is disable do not generate the span
 		logger.Debugw(ctx, "not-embedding-span-in-KVArg-", log.Fields{"rpc": rpc,
 			"log-correlation-status": log.GetGlobalLFM().GetLogCorrelationStatus(), "trace-publishing-status": log.GetGlobalLFM().GetTracePublishingStatus()})
-		return nil, opentracing.SpanFromContext(ctx), ctx
+		return nil, opentracing.GlobalTracer().StartSpan(rpc), ctx
 	}
 
 	var spanName strings.Builder