diff --git a/app/tones/app_defaults.php b/app/tones/app_defaults.php
index 4ce09fd8b7..0f2c17269f 100644
--- a/app/tones/app_defaults.php
+++ b/app/tones/app_defaults.php
@@ -27,18 +27,16 @@
 if ($domains_processed == 1) {
 
 	//Change ringtones to tones
-	$sql = "select * from v_vars";
-	$sql .= "where var_category = 'Ringtones'; ";
+	$sql = "select * from v_vars ";
+	$sql .= "where var_category = 'Tones' and var_name like '%-ring%'; ";
 	$prep_statement = $db->prepare(check_sql($sql));
 	$prep_statement->execute();
-	$tones = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	if (is_array($tones)) {
-		foreach ($tones as &$row) {
-			$sql = "update v_vars set var_category = 'Tones' ";
-			$sql .= "where var_category = 'Ringtones'; ";
-			$db->exec(check_sql($sql));
-			unset($sql);
-		}
+	$ringtones = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+	if (is_array($ringtones)) {
+		$sql = "update v_vars set var_category = 'Ringtones'  ";
+		$sql .= "where  var_category = 'Tones' and var_name like '%-ring%'; ";
+		$db->exec(check_sql($sql));
+		unset($sql);
 	}
 
 }