diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_ei.h b/src/mod/event_handlers/mod_kazoo/kazoo_ei.h
index 3d844655b7..b28a888978 100644
--- a/src/mod/event_handlers/mod_kazoo/kazoo_ei.h
+++ b/src/mod/event_handlers/mod_kazoo/kazoo_ei.h
@@ -205,6 +205,7 @@ struct globals_s {
 
 	int legacy_events;
 	uint8_t tweaks[KZ_TWEAK_MAX];
+	switch_bool_t expand_headers_on_fetch;
 
 
 };
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_ei_config.c b/src/mod/event_handlers/mod_kazoo/kazoo_ei_config.c
index 9357211afb..0d2b95a8c2 100644
--- a/src/mod/event_handlers/mod_kazoo/kazoo_ei_config.c
+++ b/src/mod/event_handlers/mod_kazoo/kazoo_ei_config.c
@@ -203,6 +203,9 @@ switch_status_t kazoo_ei_config(switch_xml_t cfg) {
 			} else if (!strcmp(var, "legacy-events")) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set legacy-events: %s\n", val);
 				kazoo_globals.legacy_events = switch_true(val);
+			} else if (!strcmp(var, "expand-headers-on-fetch")) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Set expand-headers-on-fetch: %s\n", val);
+				kazoo_globals.expand_headers_on_fetch = switch_true(val);
 			}
 		}
 	}
diff --git a/src/mod/event_handlers/mod_kazoo/kazoo_fetch_agent.c b/src/mod/event_handlers/mod_kazoo/kazoo_fetch_agent.c
index 24d4358b7e..555fe942bf 100644
--- a/src/mod/event_handlers/mod_kazoo/kazoo_fetch_agent.c
+++ b/src/mod/event_handlers/mod_kazoo/kazoo_fetch_agent.c
@@ -301,7 +301,9 @@ static switch_xml_t fetch_handler(const char *section, const char *tag_name, con
 	/* after all that did we get what we were after?! */
 	if (reply.xml_str) {
 		/* HELL YA WE DID */
-		reply.xml_str = expand_vars(reply.xml_str);
+		if (kazoo_globals.expand_headers_on_fetch) {
+			reply.xml_str = expand_vars(reply.xml_str);
+		}
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received %s XML (%s) after %dms: %s\n"
 						  ,section
 						  ,reply.uuid_str