diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index ba8f7b71c7..2791692cab 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1679,14 +1679,16 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 						to_host = switch_channel_get_variable(rchannel, "sip_to_host");
 						from_user = switch_channel_get_variable(channel, "sip_from_user");
 						from_host = switch_channel_get_variable(channel, "sip_from_host");
+						to_tag = switch_channel_get_variable(rchannel, "sip_to_tag");
+						from_tag = switch_channel_get_variable(rchannel, "sip_from_tag");
 					} else {
 						to_host = switch_channel_get_variable(channel, "sip_to_host");
 						from_user = switch_channel_get_variable(rchannel, "sip_from_user");
 						from_host = switch_channel_get_variable(rchannel, "sip_from_host");
+						from_tag = switch_channel_get_variable(rchannel, "sip_to_tag");
+						to_tag = switch_channel_get_variable(rchannel, "sip_from_tag");
 					}
 
-					to_tag = switch_channel_get_variable(rchannel, "sip_to_tag");
-					from_tag = switch_channel_get_variable(rchannel, "sip_from_tag");
 					switch_core_session_rwunlock(rsession);
 				}
 			}