diff --git a/app/dialplans/resources/switch/conf/dialplan/870_cidlookup.xml b/app/dialplans/resources/switch/conf/dialplan/870_cidlookup.xml
index 8f479f5cea..3b9912fe2d 100644
--- a/app/dialplans/resources/switch/conf/dialplan/870_cidlookup.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/870_cidlookup.xml
@@ -1,10 +1,13 @@
 <context name="{v_context}">
 	<extension name="cidlookup" number="" continue="true" app_uuid="a0cb498c-6e09-441f-83ea-a7684565c44e" enabled="false" order="870">
-		<condition field="${user_exists}" expression="^true$"/>
-		<condition field="${call_direction}" expression="^inbound$"/>
-		<condition field="${module_exists(mod_cidlookup)}" expression="^true$"/>
-		<condition field="caller_id_number" expression="^\+?1?(\d{10})$">
+		<condition field="${user_exists}" expression="^true$" break="never"/>
+		<condition field="${call_direction}" expression="^inbound$" break="never"/>
+		<condition field="${module_exists(mod_cidlookup)}" expression="^true$" break="never"/>
+		<condition field="caller_id_number" expression="^\+?1?(\d{10})$" break="never"/>
 			<action application="set" data="effective_caller_id_name=${cidlookup(1$1)}"/>
 		</condition>
+		<condition field="${cidlookup_caller_id_name}" expression="^(?!UNKNOWN)">
+			<action application="set" data="effective_caller_id_name=${cidlookup_caller_id_name}" inline="true"/>
+		</condition>
 	</extension>
 </context>