diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 443a5eafeb..8e9ad76593 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -2072,8 +2072,6 @@ switch_status_t config_sofia(int reload, char *profile_name)
 				}
 
 				profile->tcp_contact = switch_core_sprintf(profile->pool, "%s;transport=tcp", profile->url);
-				profile->tls_contact = switch_core_sprintf(profile->pool, "%s;transport=tls", profile->url);
-				
 				
 				if (profile->bind_params) {
 					char *bindurl = profile->bindurl;
@@ -2130,6 +2128,7 @@ switch_status_t config_sofia(int reload, char *profile_name)
 					if (!profile->tls_cert_dir) {
 						profile->tls_cert_dir = switch_core_sprintf(profile->pool, "%s/ssl", SWITCH_GLOBAL_dirs.conf_dir);
 					}
+					profile->tls_contact = switch_core_sprintf(profile->pool, "%s;transport=tls", profile->tls_url);
 				}
 			}
 			if (profile) {
diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 89d618e0b4..6aefa199a5 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -1540,7 +1540,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 
 		if (status < 200) {
 			char *sticky = NULL;
-			char *contact_str = profile->url;
+			char *contactstr = profile->url;
 			
 			if (is_nat) {
 				char params[128] = "";
@@ -1558,9 +1558,9 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 			}
 			
 			if (switch_stristr("port=tcp", contact->m_url->url_params)) {
-				contact_str = profile->tcp_contact;
+				contactstr = profile->tcp_contact;
 			} else if (switch_stristr("port=tls", contact->m_url->url_params)) {
-				contact_str = profile->tls_contact;
+				contactstr = profile->tls_contact;
 			}