diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php
index 688ddc397..391ae7dbb 100644
--- a/airtime_mvc/application/models/StreamSetting.php
+++ b/airtime_mvc/application/models/StreamSetting.php
@@ -75,8 +75,13 @@ class Application_Model_StreamSetting
             $host = $streamData[$prefix."host"];
             $port = $streamData[$prefix."port"];
             $mount = $streamData[$prefix."mount"];
+            if ($streamData[$prefix."output"] == "shoutcast") {
+                $url = "http://$host:$port/";
+            } else { //Icecast
+                $url = "http://$host:$port/$mount";
+            }
             $streams[$id] = Array(
-                "url" => "http://$host:$port/$mount",
+                "url" => $url,
                 "codec" => $streamData[$prefix."type"],
                 "bitrate" => $streamData[$prefix."bitrate"],
                 "mobile" => $streamData[$prefix."mobile"]