diff --git a/app/gateways/gateway_delete.php b/app/gateways/gateway_delete.php
index ef8efb3b94..cc18279ccf 100644
--- a/app/gateways/gateway_delete.php
+++ b/app/gateways/gateway_delete.php
@@ -59,14 +59,11 @@ if (strlen($_GET["id"])>0) {
 		unset ($prep_statement);
 
 	//delete the xml file
-		if (count($_SESSION["domains"]) > 1) {
-			$gateway_xml_file = $_SESSION['switch']['sip_profiles']['dir']."/".$profile."/v_".$_SESSION['domain_name'].'-'.$gateway.".xml";
-		}
-		else {
+		if ($_SESSION['switch']['sip_profiles']['dir'] != '') {
 			$gateway_xml_file = $_SESSION['switch']['sip_profiles']['dir']."/".$profile."/v_".$gateway_uuid.".xml";
-		}
-		if (file_exists($gateway_xml_file)) {
-			unlink($gateway_xml_file);
+			if (file_exists($gateway_xml_file)) {
+				unlink($gateway_xml_file);
+			}
 		}
 
 	//create the event socket connection and stop the gateway
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index 042453a6da..163b9ad190 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -208,7 +208,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= ")";
 				$db->exec(check_sql($sql));
 				unset($sql);
-
 			} //if ($action == "add")
 
 			if ($action == "update" && permission_exists('gateway_edit')) {
@@ -244,9 +243,16 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "and gateway_uuid = '$gateway_uuid'";
 				$db->exec(check_sql($sql));
 				unset($sql);
-
 			} //if ($action == "update")
 
+			//remove xml file (if any) if not enabled
+				if ($enabled != 'true' && $_SESSION['switch']['sip_profiles']['dir'] != '') {
+					$gateway_xml_file = $_SESSION['switch']['sip_profiles']['dir']."/".$profile."/v_".$gateway_uuid.".xml";
+					if (file_exists($gateway_xml_file)) {
+						unlink($gateway_xml_file);
+					}
+				}
+
 			//syncrhonize configuration
 				save_gateway_xml();