diff --git a/cmd/collector/app/zipkin/fixtures/zipkin_03.json b/cmd/collector/app/zipkin/fixtures/zipkin_03.json
new file mode 100644
index 00000000000..0c735f04c03
--- /dev/null
+++ b/cmd/collector/app/zipkin/fixtures/zipkin_03.json
@@ -0,0 +1,23 @@
+[
+  {
+    "traceId": "091f00370361e578",
+    "parentId": "c26551047c72d19",
+    "id": "188bb8428fc7e477",
+    "kind": "PRODUCER",
+    "name": "send",
+    "timestamp": 1597704629675602,
+    "duration": 9550570,
+    "localEndpoint":
+    {
+        "serviceName": "schemas-service"
+    },
+    "remoteEndpoint":
+    {
+        "serviceName": "kafka"
+    },
+    "tags":
+    {
+        "kafka.topic": "schema-changed"
+    }
+  }
+]
\ No newline at end of file
diff --git a/cmd/collector/app/zipkin/jsonv2_test.go b/cmd/collector/app/zipkin/jsonv2_test.go
index 422dd32018f..99e0b427cab 100644
--- a/cmd/collector/app/zipkin/jsonv2_test.go
+++ b/cmd/collector/app/zipkin/jsonv2_test.go
@@ -15,7 +15,6 @@
 package zipkin
 
 import (
-	"fmt"
 	"os"
 	"testing"
 
@@ -23,6 +22,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/jaegertracing/jaeger/model"
+	"github.com/jaegertracing/jaeger/model/converter/thrift/zipkin"
 	"github.com/jaegertracing/jaeger/swagger-gen/models"
 	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
@@ -54,7 +55,6 @@ func TestLCFromLocalEndpoint(t *testing.T) {
 	var spans models.ListOfSpans
 	loadJSON(t, "fixtures/zipkin_02.json", &spans)
 	tSpans, err := spansV2ToThrift(spans)
-	fmt.Println(tSpans[0])
 	require.NoError(t, err)
 	assert.Equal(t, len(tSpans), 1)
 	var ts int64 = 1
@@ -67,6 +67,54 @@ func TestLCFromLocalEndpoint(t *testing.T) {
 	assert.Equal(t, tSpan, tSpans[0])
 }
 
+func TestMissingKafkaEndpoint(t *testing.T) {
+	var spans models.ListOfSpans
+	loadJSON(t, "fixtures/zipkin_03.json", &spans)
+	tSpans, err := spansV2ToThrift(spans)
+	require.NoError(t, err)
+	assert.Equal(t, 1, len(tSpans))
+	var ts int64 = 1597704629675602
+	var d int64 = 9550570
+	var parentId int64 = 0xc26551047c72d19
+	var endpoint1 = zipkincore.Endpoint{ServiceName: "schemas-service"}
+	var endpoint2 = zipkincore.Endpoint{ServiceName: "schemas-service"}
+	var endpoint3 = zipkincore.Endpoint{ServiceName: "kafka"}
+
+	tSpan := &zipkincore.Span{ID: 0x188bb8428fc7e477, TraceID: 0x091f00370361e578, ParentID: &parentId,
+		Name: "send", Duration: &d, Timestamp: &ts,
+		Annotations: []*zipkincore.Annotation{
+			{
+				Host:      &endpoint1,
+				Timestamp: ts,
+				Value:     zipkincore.MESSAGE_SEND,
+			},
+		},
+		BinaryAnnotations: []*zipkincore.BinaryAnnotation{
+			{
+				Host:           &endpoint2,
+				Key:            "kafka.topic",
+				Value:          []byte("schema-changed"),
+				AnnotationType: zipkincore.AnnotationType_STRING},
+			{
+
+				Key:            zipkincore.MESSAGE_ADDR,
+				Host:           &endpoint3,
+				AnnotationType: zipkincore.AnnotationType_BOOL,
+			},
+		},
+	}
+	assert.Equal(t, tSpan, tSpans[0])
+
+	tTags := []model.KeyValue{
+		{Key: "kafka.topic", VStr: "schema-changed"},
+		{Key: "peer.service", VStr: "kafka"},
+	}
+	var jaegerspan []*model.Span
+	jaegerspan, err = zipkin.ToDomainSpan(tSpans[0])
+	require.NoError(t, err)
+	assert.Equal(t, tTags, jaegerspan[0].GetTags())
+}
+
 func TestKindToThrift(t *testing.T) {
 	tests := []struct {
 		ts       int64
diff --git a/model/converter/thrift/zipkin/to_domain.go b/model/converter/thrift/zipkin/to_domain.go
index 9f158fadd32..73e68f84576 100644
--- a/model/converter/thrift/zipkin/to_domain.go
+++ b/model/converter/thrift/zipkin/to_domain.go
@@ -288,7 +288,7 @@ func (td toDomain) getTags(binAnnotations []*zipkincore.BinaryAnnotation, tagInc
 			value := string(annotation.Value)
 			tag := model.String(string(ext.Component), value)
 			retMe = append(retMe, tag)
-		case zipkincore.SERVER_ADDR, zipkincore.CLIENT_ADDR:
+		case zipkincore.SERVER_ADDR, zipkincore.CLIENT_ADDR, zipkincore.MESSAGE_ADDR:
 			retMe = td.getPeerTags(annotation.Host, retMe)
 		default:
 			tag, err := td.transformBinaryAnnotation(annotation)