diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 514fbcf527..2b0517dd79 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -489,6 +489,10 @@ static switch_status_t channel_on_destroy(switch_core_session_t *session)
 		if (tech_pvt->write_codec.implementation) {
 			switch_core_codec_destroy(&tech_pvt->write_codec);
 		}
+
+		switch_core_session_unset_read_codec(session);
+		switch_core_session_unset_write_codec(session);
+
 	}
 
 	return SWITCH_STATUS_SUCCESS;
diff --git a/libs/freetdm/mod_freetdm/tdm.c b/libs/freetdm/mod_freetdm/tdm.c
index 0f8b5814c1..911a3a1f22 100644
--- a/libs/freetdm/mod_freetdm/tdm.c
+++ b/libs/freetdm/mod_freetdm/tdm.c
@@ -522,6 +522,9 @@ static switch_status_t channel_on_destroy(switch_core_session_t *session)
 		if (tech_pvt->write_codec.implementation) {
 			switch_core_codec_destroy(&tech_pvt->write_codec);
 		}
+
+		switch_core_session_unset_read_codec(session);
+		switch_core_session_unset_write_codec(session);
         
         ftdm_channel_close(&tech_pvt->ftdm_channel);
 	}