diff --git a/conf/insideout/sip_profiles/external.xml b/conf/insideout/sip_profiles/external.xml
index 3fcb969f7f..be38318432 100644
--- a/conf/insideout/sip_profiles/external.xml
+++ b/conf/insideout/sip_profiles/external.xml
@@ -47,6 +47,7 @@
     <param name="nonce-ttl" value="60"/>
     <param name="auth-calls" value="false"/>
     <param name="rtp-timeout-sec" value="1800"/>
+    <param name="inbound-late-negotiation" value="true"/>
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
     -->
diff --git a/conf/insideout/sip_profiles/internal-ipv6.xml b/conf/insideout/sip_profiles/internal-ipv6.xml
index 649246ad36..e433da1425 100644
--- a/conf/insideout/sip_profiles/internal-ipv6.xml
+++ b/conf/insideout/sip_profiles/internal-ipv6.xml
@@ -66,8 +66,8 @@
     <!--Uncomment to set all inbound calls to proxy media mode-->
     <!--<param name="inbound-proxy-media" value="true"/>-->
 
-    <!--Uncomment to let calls hit the dialplan *before* you decide if the codec is ok-->
-    <!--<param name="inbound-late-negotiation" value="true"/>-->
+    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
+    <param name="inbound-late-negotiation" value="true"/>
 
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
diff --git a/conf/insideout/sip_profiles/internal.xml b/conf/insideout/sip_profiles/internal.xml
index 3ea2ef155c..61263f03dc 100644
--- a/conf/insideout/sip_profiles/internal.xml
+++ b/conf/insideout/sip_profiles/internal.xml
@@ -101,8 +101,8 @@
     <!--Uncomment to set all inbound calls to proxy media mode-->
     <!--<param name="inbound-proxy-media" value="true"/>-->
 
-    <!--Uncomment to let calls hit the dialplan *before* you decide if the codec is ok-->
-    <!--<param name="inbound-late-negotiation" value="true"/>-->
+    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
+    <param name="inbound-late-negotiation" value="true"/>
 
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
diff --git a/conf/sbc/sbc_profiles/external.xml b/conf/sbc/sbc_profiles/external.xml
index 9a5686bd91..1cb91e8dab 100644
--- a/conf/sbc/sbc_profiles/external.xml
+++ b/conf/sbc/sbc_profiles/external.xml
@@ -48,6 +48,7 @@
     <param name="nonce-ttl" value="60"/>
     <param name="auth-calls" value="false"/>
     <param name="rtp-timeout-sec" value="1800"/>
+    <param name="inbound-late-negotiation" value="true"/>
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
     -->
diff --git a/conf/sbc/sbc_profiles/internal-ipv6.xml b/conf/sbc/sbc_profiles/internal-ipv6.xml
index 649246ad36..e433da1425 100644
--- a/conf/sbc/sbc_profiles/internal-ipv6.xml
+++ b/conf/sbc/sbc_profiles/internal-ipv6.xml
@@ -66,8 +66,8 @@
     <!--Uncomment to set all inbound calls to proxy media mode-->
     <!--<param name="inbound-proxy-media" value="true"/>-->
 
-    <!--Uncomment to let calls hit the dialplan *before* you decide if the codec is ok-->
-    <!--<param name="inbound-late-negotiation" value="true"/>-->
+    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
+    <param name="inbound-late-negotiation" value="true"/>
 
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
diff --git a/conf/sbc/sbc_profiles/internal.xml b/conf/sbc/sbc_profiles/internal.xml
index 7e1ceeb9df..8263a82668 100644
--- a/conf/sbc/sbc_profiles/internal.xml
+++ b/conf/sbc/sbc_profiles/internal.xml
@@ -107,8 +107,8 @@
     <!--Uncomment to set all inbound calls to proxy media mode-->
     <!--<param name="inbound-proxy-media" value="true"/>-->
 
-    <!--Uncomment to let calls hit the dialplan *before* you decide if the codec is ok-->
-    <!--<param name="inbound-late-negotiation" value="true"/>-->
+    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
+    <param name="inbound-late-negotiation" value="true"/>
 
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
diff --git a/conf/vanilla/sip_profiles/external.xml b/conf/vanilla/sip_profiles/external.xml
index 39965e9421..8176d9b23f 100644
--- a/conf/vanilla/sip_profiles/external.xml
+++ b/conf/vanilla/sip_profiles/external.xml
@@ -56,6 +56,7 @@
     <param name="inbound-codec-negotiation" value="generous"/>
     <param name="nonce-ttl" value="60"/>
     <param name="auth-calls" value="false"/>
+    <param name="inbound-late-negotiation" value="true"/>
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
     -->
diff --git a/conf/vanilla/sip_profiles/internal-ipv6.xml b/conf/vanilla/sip_profiles/internal-ipv6.xml
index 5a97f0cd60..2dd3842649 100644
--- a/conf/vanilla/sip_profiles/internal-ipv6.xml
+++ b/conf/vanilla/sip_profiles/internal-ipv6.xml
@@ -67,8 +67,8 @@
     <!--Uncomment to set all inbound calls to proxy media mode-->
     <!--<param name="inbound-proxy-media" value="true"/>-->
 
-    <!--Uncomment to let calls hit the dialplan *before* you decide if the codec is ok-->
-    <!--<param name="inbound-late-negotiation" value="true"/>-->
+    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
+    <param name="inbound-late-negotiation" value="true"/>
 
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
diff --git a/conf/vanilla/sip_profiles/internal.xml b/conf/vanilla/sip_profiles/internal.xml
index afb12ab94c..1ba2c57427 100644
--- a/conf/vanilla/sip_profiles/internal.xml
+++ b/conf/vanilla/sip_profiles/internal.xml
@@ -219,8 +219,8 @@
     <!--Uncomment to set all inbound calls to proxy media mode-->
     <!--<param name="inbound-proxy-media" value="true"/>-->
 
-    <!--Uncomment to let calls hit the dialplan *before* you decide if the codec is ok-->
-    <!--<param name="inbound-late-negotiation" value="true"/>-->
+    <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
+    <param name="inbound-late-negotiation" value="true"/>
 
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
diff --git a/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml b/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
index 2649a24ae8..9acbe6d916 100644
--- a/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
+++ b/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
@@ -263,9 +263,8 @@
         <!-- Uncomment to set all inbound calls to proxy media mode -->
         <!-- <param name="inbound-proxy-media" value="true"/> -->
 
-        <!-- Uncomment to let calls hit the dialplan *before* you decide if the
-             codec is ok -->
-        <!-- <param name="inbound-late-negotiation" value="true"/> -->
+        <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
+        <param name="inbound-late-negotiation" value="true"/>
 
         <!-- this lets anything register -->
         <!-- comment the next line and uncomment one or both of the other 2