diff --git a/src/mod/applications/mod_spandsp/mod_spandsp.c b/src/mod/applications/mod_spandsp/mod_spandsp.c
index ae0ecd9c85..cf76422db6 100644
--- a/src/mod/applications/mod_spandsp/mod_spandsp.c
+++ b/src/mod/applications/mod_spandsp/mod_spandsp.c
@@ -35,7 +35,7 @@
  */
 
 
-#define MY_EVENT_TDD_SEND_MESSAGE "TDD::SEND_MESSAGE"
+
 #include "mod_spandsp.h"
 #include <spandsp/version.h>
 #include "mod_spandsp_modem.h"
diff --git a/src/mod/applications/mod_spandsp/mod_spandsp.h b/src/mod/applications/mod_spandsp/mod_spandsp.h
index 7e1eb49fa8..68152ffdf9 100644
--- a/src/mod/applications/mod_spandsp/mod_spandsp.h
+++ b/src/mod/applications/mod_spandsp/mod_spandsp.h
@@ -42,6 +42,9 @@ typedef HANDLE zap_socket_t;
 typedef int zap_socket_t;
 #endif
 
+#define MY_EVENT_TDD_SEND_MESSAGE "TDD::SEND_MESSAGE"
+#define MY_EVENT_TDD_RECV_MESSAGE "TDD::RECV_MESSAGE"
+
 #define MAX_MODEMS 1024
 #define SPANDSP_EXPOSE_INTERNAL_STRUCTURES
 #include <spandsp.h>
diff --git a/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c b/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
index 57ba4547f9..8eb8092c1e 100644
--- a/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
+++ b/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
@@ -114,7 +114,8 @@ static void put_text_msg(void *user_data, const uint8_t *msg, int len)
 
     switch_channel_add_variable_var_check(channel, "tdd_messages", (char *)msg, SWITCH_FALSE, SWITCH_STACK_PUSH);
 
-    if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
+    
+    if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_TDD_RECV_MESSAGE) == SWITCH_STATUS_SUCCESS) {
         
         switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", "mod_spandsp");
         switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", "tdd");