diff --git a/app/ivr_menus/ivr_menu_edit.php b/app/ivr_menus/ivr_menu_edit.php
index e7f41e3939..13e2af7033 100644
--- a/app/ivr_menus/ivr_menu_edit.php
+++ b/app/ivr_menus/ivr_menu_edit.php
@@ -266,8 +266,13 @@
 					$array['ivr_menus'][0]["ivr_menu_tts_voice"] = $ivr_menu_tts_voice;
 					$array['ivr_menus'][0]["ivr_menu_confirm_attempts"] = $ivr_menu_confirm_attempts;
 					$array['ivr_menus'][0]["ivr_menu_timeout"] = $ivr_menu_timeout;
-					$array['ivr_menus'][0]["ivr_menu_exit_app"] = $ivr_menu_exit_app;
-					$array['ivr_menus'][0]["ivr_menu_exit_data"] = $ivr_menu_exit_data;
+					if ($destination->valid($ivr_menu_exit_app.":".$ivr_menu_exit_data)) {
+						$array['ivr_menus'][0]["ivr_menu_exit_app"] = $ivr_menu_exit_app;
+						$array['ivr_menus'][0]["ivr_menu_exit_data"] = $ivr_menu_exit_data;
+					}
+					else {
+						$ivr_menu_exit_app = "";
+					}
 					$array['ivr_menus'][0]["ivr_menu_inter_digit_timeout"] = $ivr_menu_inter_digit_timeout;
 					$array['ivr_menus'][0]["ivr_menu_max_failures"] = $ivr_menu_max_failures;
 					$array['ivr_menus'][0]["ivr_menu_max_timeouts"] = $ivr_menu_max_timeouts;
@@ -338,7 +343,9 @@
 						$dialplan_xml .= "		<action application=\"ivr\" data=\"".$ivr_menu_uuid."\"/>\n";
 					}
 
-					$dialplan_xml .= "		<action application=\"".$ivr_menu_exit_app."\" data=\"".$ivr_menu_exit_data."\"/>\n";
+					if (strlen($ivr_menu_exit_app) > 0) {
+						$dialplan_xml .= "		<action application=\"".$ivr_menu_exit_app."\" data=\"".$ivr_menu_exit_data."\"/>\n";
+					}
 					$dialplan_xml .= "	</condition>\n";
 					$dialplan_xml .= "</extension>\n";