diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index f27c2ec0eb..cc864a266b 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -4003,7 +4003,7 @@ SWITCH_STANDARD_API(uuid_dump_function)
 					switch_xml_t xml;
 					switch_channel_event_set_data(channel, event);
 					if (!strcasecmp(format, "xml")) {
-						if ((xml = switch_event_xmlize(event, "%s", ""))) {
+						if ((xml = switch_event_xmlize(event, SWITCH_VA_NONE))) {
 							buf = switch_xml_toxml(xml, SWITCH_FALSE);
 							switch_xml_free(xml);
 						} else {
diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
index e6c403b658..3f7d680d52 100644
--- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
+++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
@@ -966,7 +966,7 @@ SWITCH_STANDARD_API(event_sink_function)
 				switch_xml_t xml;
 				etype = "xml";
 
-				if ((xml = switch_event_xmlize(pevent, "%s", ""))) {
+				if ((xml = switch_event_xmlize(pevent, SWITCH_VA_NONE))) {
 					listener->ebuf = switch_xml_toxml(xml, SWITCH_FALSE);
 					switch_xml_free(xml);
 				} else {
@@ -1257,7 +1257,7 @@ static switch_status_t read_packet(listener_t *listener, switch_event_t **event,
 						switch_xml_t xml;
 						etype = "xml";
 
-						if ((xml = switch_event_xmlize(pevent, "%s", ""))) {
+						if ((xml = switch_event_xmlize(pevent, SWITCH_VA_NONE))) {
 							listener->ebuf = switch_xml_toxml(xml, SWITCH_FALSE);
 							switch_xml_free(xml);
 						} else {
diff --git a/src/mod/event_handlers/mod_event_test/mod_event_test.c b/src/mod/event_handlers/mod_event_test/mod_event_test.c
index e58adfb9f1..ba5a2aaae4 100644
--- a/src/mod/event_handlers/mod_event_test/mod_event_test.c
+++ b/src/mod/event_handlers/mod_event_test/mod_event_test.c
@@ -49,7 +49,7 @@ static void event_handler(switch_event_t *event)
 		return;
 	default:
 		switch_event_serialize(event, &buf, SWITCH_TRUE);
-		if ((xml = switch_event_xmlize(event, NULL))) {
+		if ((xml = switch_event_xmlize(event, SWITCH_VA_NONE))) {
 			xmlstr = switch_xml_toxml(xml, SWITCH_FALSE);
 			dofree++;
 		}