diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 934083a2f..8df139255 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once 'StreamSetting.php';
 require_once 'Cache.php';
 
 class Application_Model_Preference
@@ -815,6 +816,19 @@ class Application_Model_Preference
     public static function SetNumOfStreams($num)
     {
         self::setValue("num_of_streams", intval($num));
+
+        //Enable or disable each stream according to whatever was just changed.
+        for ($streamIdx = 1; $streamIdx <= MAX_NUM_STREAMS; $streamIdx++)
+        {
+            $prefix = 's' . $streamIdx . '_';
+            $enable = 'false';
+            if ($streamIdx <= intval($num)) {
+                $enable = 'true';
+            }
+
+            //Enable or disable the stream in the Stream Settings DB table.
+            Application_Model_StreamSetting::setIndividualStreamSetting(array($prefix.'enable' => $enable));
+        }
     }
 
     public static function GetNumOfStreams()
diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php
index 391ae7dbb..52deb535c 100644
--- a/airtime_mvc/application/models/StreamSetting.php
+++ b/airtime_mvc/application/models/StreamSetting.php
@@ -279,7 +279,7 @@ class Application_Model_StreamSetting
             $sql = "UPDATE cc_stream_setting SET value=:v WHERE keyname=:keyname";
             $map = array(":v" => $v, ":keyname"=>$keyname);
 
-            $res = Application_Common_Database::prepareAndExecute($sql, $map, 
+            $res = Application_Common_Database::prepareAndExecute($sql, $map,
                 Application_Common_Database::EXECUTE);
         }
     }