diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua b/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
index 0b318e1c55..d2d6848080 100644
--- a/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
+++ b/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
@@ -90,12 +90,10 @@
 
 		--get the dialplan and related details
 			sql = "select * from v_dialplans as d, v_dialplan_details as s ";
-			if (call_context == domain_name) then
-				sql = sql .. "where (d.dialplan_context = '" .. call_context .. "' or d.dialplan_context = '${domain_name}') ";
-			else
+			if (call_context == "public") then
 				sql = sql .. "where d.dialplan_context = '" .. call_context .. "' ";
-			end
-			if (call_context ~= "public") then
+			else
+				sql = sql .. "where (d.dialplan_context = '" .. call_context .. "' or d.dialplan_context = '${domain_name}') ";
 				sql = sql .. "and (d.domain_uuid = '" .. domain_uuid .. "' or d.domain_uuid is null )";
 			end
 			sql = sql .. "and d.dialplan_enabled = 'true' ";