diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index 1d0655f082..75e431968a 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -80,14 +80,13 @@
     </extension>
 
     <!-- If to_host and from_host differ this is an external sip URI so lets send it out. -->
-    <!--
     <extension name="external_sip_uri" continue="true">
       <condition field="source" expression="mod_sofia"/>
-      <condition field="${sip_from_host}" expression="${sip_to_host}">
+      <condition field="${outside_call}" expression="^$"/>
+      <condition field="${sip_req_host}" expression="${sip_from_host}">
 	<anti-action application="bridge" data="sofia/${use_profile}/${sip_to_uri}"/>
       </condition>
     </extension>
-    -->
     <!--
 	snom button demo, call 9000 to make button 2 mapped to transfer the current call to a conference
     -->
diff --git a/conf/dialplan/public.xml b/conf/dialplan/public.xml
index bfaacf6736..f947ad33fa 100644
--- a/conf/dialplan/public.xml
+++ b/conf/dialplan/public.xml
@@ -2,6 +2,12 @@
 <include>
   <context name="public">
 
+    <extension name="outside_call" continue="true">
+      <condition break="never">
+	<action application="set" data="outside_call=true"/>
+      </condition>
+    </extension>
+
     <extension name="unloop">
       <condition field="${unroll_loops}" expression="^true$"/>
       <condition field="${sip_looped_call}" expression="^true$">