diff --git a/resources/switch.php b/resources/switch.php
index a05e9d7662..b38dac9d4d 100644
--- a/resources/switch.php
+++ b/resources/switch.php
@@ -2781,7 +2781,15 @@ if (!function_exists('save_call_center_xml')) {
 						$v_queues .= "			<param name=\"moh-sound\" value=\"local_stream://default\"/>\n";
 					}
 					else {
-						$v_queues .= "			<param name=\"moh-sound\" value=\"tone_stream://$".$queue_moh_sound.";loops=-1\"/>\n";
+						if (substr($queue_moh_sound, 0, 15) == "local_stream://") {
+							$v_queues .= "			<param name=\"moh-sound\" value=\"local_stream://".$queue_moh_sound."\"/>\n";
+						}
+						elseif (substr($queue_moh_sound, 0, 2) == "${" && substr($queue_moh_sound, -5) == "ring}") {
+							$v_queues .= "			<param name=\"moh-sound\" value=\"tone_stream://".$queue_moh_sound.";loops=-1\"/>\n";
+						}
+						else {
+							$v_queues .= "			<param name=\"moh-sound\" value=\"".$queue_moh_sound."\"/>\n";
+						}
 					}
 					if (strlen($queue_record_template) > 0) {
 						$v_queues .= "			<param name=\"record-template\" value=\"$queue_record_template\"/>\n";