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 f0a2e3be74..eb33463ced 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
@@ -121,7 +121,7 @@
 				end
 			else
 				sql = "select dialplan_xml from v_dialplans as p ";
-				if (context_name == "public") then
+				if (context_name == "public" or string.match(context_name, "@")) then
 					sql = sql .. "where p.dialplan_context = :call_context ";
 				else
 					sql = sql .. "where (p.dialplan_context = :call_context or p.dialplan_context = '${domain_name}') ";