diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index d74104cd2..1068c403f 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -168,7 +168,7 @@ class LibraryController extends Zend_Controller_Action
                     return;
                 }
 
-                $res = $file->delete();
+                $res = $file->delete(true);
 
                 if (PEAR::isError($res)) {
                     $this->view->message = $res->getMessage();
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index d99058fa4..c51ea3dfd 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -303,7 +303,7 @@ class Application_Model_StoredFile {
      *
      * @return void|PEAR_Error
      */
-    public function delete()
+    public function delete($deleteFromPlaylist=false)
     {
         if ($this->exists()) {
             if ($this->getFormat() == 'audioclip') {
@@ -314,8 +314,9 @@ class Application_Model_StoredFile {
             }
         }
 
-        // don't delete from the playslist. We might want to put a flag
-        //Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId());
+        if($deleteFromPlaylist){
+            Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId());
+        }
         
         // set file_exists falg to false
         $this->_file->setDbFileExists(false);