diff --git a/agi/VD_amd.agi b/agi/VD_amd.agi
index 231a9964..d510b178 100644
--- a/agi/VD_amd.agi
+++ b/agi/VD_amd.agi
@@ -814,7 +814,7 @@ else
 				}
 			}
 
-		if ($cpd_amd_action =~ /CALLMENU|INGROUP/)
+		if ( ($AMDCAUSE !~ /^Unknown|\?\?\?/i) && ($cpd_amd_action =~ /CALLMENU|INGROUP/) )
 			{
 			$DROPexten='';
 			if ($cpd_amd_action =~ /CALLMENU/)
diff --git a/agi/agi-VDAD_ALL_outbound.agi b/agi/agi-VDAD_ALL_outbound.agi
index c924a0de..79495c20 100644
--- a/agi/agi-VDAD_ALL_outbound.agi
+++ b/agi/agi-VDAD_ALL_outbound.agi
@@ -3815,7 +3815,7 @@ sub cpd_end_call
 		$drop_seconds = $DROP_TIME;
 		}
 
-	if ( ($cpd_amd_action =~ /MESSAGE|CALLMENU|INGROUP/) && ($cpd_result !~ /Fax/i) )
+	if ( ($cpd_amd_action =~ /MESSAGE|CALLMENU|INGROUP/) && ($cpd_result !~ /Fax|^Unknown|\?\?\?/i) )
 		{
 		$DROPexten = "8320";
 		$AMDSTATUS_set =	$AGI->set_variable('AMDSTATUS', "CPDMACHINE");
@@ -3823,7 +3823,7 @@ sub cpd_end_call
 		}
 	else
 		{
-		if ( ($cpd_unknown_action =~ /MESSAGE|CALLMENU|INGROUP/) && ($cpd_result !~ /Fax/i) )
+		if ( ($cpd_unknown_action =~ /MESSAGE|CALLMENU|INGROUP/) && ($cpd_result =~ /^Unknown|\?\?\?/i) )
 			{
 			$DROPexten = "8320";
 			$AMDSTATUS_set =	$AGI->set_variable('AMDSTATUS', "CPDMACHINE");