diff --git a/packages/dd-trace/src/plugins/consumer.js b/packages/dd-trace/src/plugins/consumer.js
index 88128bff1f6..0a1f223b89a 100644
--- a/packages/dd-trace/src/plugins/consumer.js
+++ b/packages/dd-trace/src/plugins/consumer.js
@@ -8,15 +8,12 @@ class ConsumerPlugin extends InboundPlugin {
   static get type () { return 'messaging' }
 
   startSpan (options) {
-    const spanDefaults = {
-      service: this.config.service || this.serviceName(),
-      kind: this.constructor.kind
+    if (!options.service) {
+      options.service = this.config.service || this.serviceName()
+    }
+    if (!options.kind) {
+      options.kind = this.constructor.kind
     }
-    Object.keys(spanDefaults).forEach(
-      key => {
-        if (!options[key]) options[key] = spanDefaults[key]
-      }
-    )
     return super.startSpan(this.operationName(), options)
   }
 }
diff --git a/packages/dd-trace/src/plugins/producer.js b/packages/dd-trace/src/plugins/producer.js
index 99f914edabe..13b9bd84d20 100644
--- a/packages/dd-trace/src/plugins/producer.js
+++ b/packages/dd-trace/src/plugins/producer.js
@@ -9,9 +9,11 @@ class ProducerPlugin extends OutboundPlugin {
 
   startSpan (options) {
     const spanDefaults = {
-      service: this.config.service || this.serviceName(),
       kind: this.constructor.kind
     }
+    if (!options.service) {
+      options.service = this.config.service || this.serviceName()
+    }
     Object.keys(spanDefaults).forEach(
       key => {
         if (!options[key]) options[key] = spanDefaults[key]