diff --git a/app/dialplans/resources/switch/conf/dialplan/520_follow_me_bridge.xml b/app/dialplans/resources/switch/conf/dialplan/520_follow_me_bridge.xml
index 2d8154e579..fa8bf43dd4 100644
--- a/app/dialplans/resources/switch/conf/dialplan/520_follow_me_bridge.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/520_follow_me_bridge.xml
@@ -10,6 +10,11 @@
 		<action application="set" data="hangup_after_bridge=true"/>
 		<action application="set" data="continue_on_fail=true"/>
 		<action application="bridge" data="${follow_me_destinations}"/>
-		<action application="transfer" data="*99${destination_number} XML ${domain_name}"/>
+	</condition>
+	<condition field="${user_exists}" expression="true"/>
+	<condition field="${follow_me_enabled}" expression="true"/>
+	<condition field="${forward_no_answer_enabled}" expression="true" break="never">
+		<action application="transfer" data="${forward_no_answer_destination} XML ${domain_name}"/>
+		<anti-action application="transfer" data="*99${destination_number} XML ${domain_name}"/>
 	</condition>
 </extension>