diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 1134499ce..2b48b40b7 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -421,8 +421,8 @@ class PlaylistController extends Zend_Controller_Action
     
     public function setCrossfadeAction()
     {
-    	$id1 = $this->_getParam('id1');
-    	$id2 = $this->_getParam('id2');
+    	$id1 = $this->_getParam('id1', null);
+    	$id2 = $this->_getParam('id2', null);
     	$type = $this->_getParam('type');
     	$fadeIn = $this->_getParam('fadeIn', 0);
     	$fadeOut = $this->_getParam('fadeOut', 0);
diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index bab3d3ed8..b1ac483a5 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -688,8 +688,12 @@ SQL;
     	$this->con->beginTransaction();
     	 
     	try {
-    		$this->changeFadeInfo($id1, null, $fadeOut);
-    		$this->changeFadeInfo($id2, $fadeIn, null, $offset);
+    		if (isset($id1)) {
+    			$this->changeFadeInfo($id1, null, $fadeOut);
+    		}
+    		if (isset($id2)) {
+    			$this->changeFadeInfo($id2, $fadeIn, null, $offset);
+    		}
     
     		$this->con->commit();
     
diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index 16e89c7d5..aa74c78c4 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -670,8 +670,12 @@ SQL;
     	$this->con->beginTransaction();
     	
     	try {
-    		$this->changeFadeInfo($id1, null, $fadeOut);
-    		$this->changeFadeInfo($id2, $fadeIn, null, $offset);
+    		if (isset($id1)) {
+    			$this->changeFadeInfo($id1, null, $fadeOut);
+    		}
+    		if (isset($id2)) {
+    			$this->changeFadeInfo($id2, $fadeIn, null, $offset);
+    		}
     		
     		$this->con->commit();
     		
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index 403c0d230..b15f56540 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -1254,7 +1254,10 @@ var AIRTIME = (function(AIRTIME){
                 		fadeIn = fade["end"] - fade["start"];
                 	}
                 	
-                	changeCrossfade($html, id1, id2, fadeIn.toFixed(1), fadeOut.toFixed(1), offset);
+                	fadeIn = (fadeIn === undefined) ? undefined : fadeIn.toFixed(1);
+                	fadeOut = (fadeOut === undefined) ? undefined : fadeOut.toFixed(1);
+                	
+                	changeCrossfade($html, id1, id2, fadeIn, fadeOut, offset);
                 }}
             ],
             open: function (event, ui) {