diff --git a/src/mod/event_handlers/mod_amqp/mod_amqp_producer.c b/src/mod/event_handlers/mod_amqp/mod_amqp_producer.c
index dd649495d7..b2bf964463 100644
--- a/src/mod/event_handlers/mod_amqp/mod_amqp_producer.c
+++ b/src/mod/event_handlers/mod_amqp/mod_amqp_producer.c
@@ -253,9 +253,9 @@ switch_status_t mod_amqp_producer_create(char *name, switch_xml_t cfg)
 					profile->enable_fallback_format_fields = 1;
 				}
 			} else if (!strncmp(var, "exchange", 8)) {
-				exchange = switch_core_strdup(profile->pool, "TAP.Events");
+				exchange = switch_core_strdup(profile->pool, val);
 			} else if (!strncmp(var, "exchange_type", 13)) {
-				exchange_type = switch_core_strdup(profile->pool, "topic");
+				exchange_type = switch_core_strdup(profile->pool, val);
 			} else if (!strncmp(var, "format_fields", 13)) {
 				int size = 0;
 				if ((size = mod_amqp_count_chars(val, ',')) >= MAX_ROUTING_KEY_FORMAT_FIELDS) {