diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php
index 4f9b57af69..54d6f00861 100644
--- a/app/call_flows/call_flow_edit.php
+++ b/app/call_flows/call_flow_edit.php
@@ -52,6 +52,9 @@
 		$action = "add";
 	}
 
+//initialize the destinations object
+	$destination = new destinations;
+
 //get http post variables and set them to php variables
 	if (is_array($_POST)) {
 
@@ -207,10 +210,14 @@
 			$array["call_flows"][$i]["call_flow_sound"] = $call_flow_sound;
 			$array["call_flows"][$i]["call_flow_alternate_label"] = $call_flow_alternate_label;
 			$array["call_flows"][$i]["call_flow_alternate_sound"] = $call_flow_alternate_sound;
-			$array["call_flows"][$i]["call_flow_app"] = $call_flow_app;
-			$array["call_flows"][$i]["call_flow_data"] = $call_flow_data;
-			$array["call_flows"][$i]["call_flow_alternate_app"] = $call_flow_alternate_app;
-			$array["call_flows"][$i]["call_flow_alternate_data"] = $call_flow_alternate_data;
+			if ($destination->valid($call_flow_app.':'.$call_flow_data)) {
+				$array["call_flows"][$i]["call_flow_app"] = $call_flow_app;
+				$array["call_flows"][$i]["call_flow_data"] = $call_flow_data;
+			}
+			if ($destination->valid($call_flow_alternate_app.':'.$call_flow_alternate_data)) {
+				$array["call_flows"][$i]["call_flow_alternate_app"] = $call_flow_alternate_app;
+				$array["call_flows"][$i]["call_flow_alternate_data"] = $call_flow_alternate_data;
+			}
 			$array["call_flows"][$i]["call_flow_context"] = $call_flow_context;
 			$array["call_flows"][$i]["call_flow_description"] = $call_flow_description;
 
@@ -262,9 +269,6 @@
 			}
 	} //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0)
 
-//initialize the destinations object
-	$destination = new destinations;
-
 //pre-populate the form
 	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
 		$call_flow_uuid = $_GET["id"];
@@ -700,4 +704,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>