diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php
index ea37a2d29a..ec01b162c5 100644
--- a/module/projectrelease/model.php
+++ b/module/projectrelease/model.php
@@ -217,19 +217,16 @@ class projectreleaseModel extends model
                 $this->loadModel('story');
                 $this->loadModel('action');
 
-                $storyIDList = explode(',', $release->stories);
-                $product = $this->loadModel('product')->getById($release->product);
+                $storyIDList = array_filter(explode(',', $release->stories));
+                $product     = $this->loadModel('product')->getById($release->product);
                 foreach($storyIDList as $storyID)
                 {
-                    if($storyID)
-                    {
-                        $this->dao->update(TABLE_STORY)->set('stagedBy')->eq('')->where('id')->eq($storyID)->exec();
-                        if($product and $product->type != 'normal') $this->dao->update(TABLE_STORYSTAGE)->set('stagedBy')->eq('')->where('story')->eq($storyID)->andWhere('branch')->eq($release->branch)->exec();
+                    $this->dao->update(TABLE_STORY)->set('stagedBy')->eq('')->where('id')->eq($storyID)->exec();
+                    if($product and $product->type != 'normal') $this->dao->update(TABLE_STORYSTAGE)->set('stagedBy')->eq('')->where('story')->eq($storyID)->andWhere('branch')->eq($release->branch)->exec();
 
-                        $this->story->setStage($storyID);
+                    $this->story->setStage($storyID);
 
-                        $this->action->create('story', $storyID, 'linked2release', '', $releaseID);
-                    }
+                    $this->action->create('story', $storyID, 'linked2release', '', $releaseID);
                 }
             }
 
diff --git a/module/release/model.php b/module/release/model.php
index 93f1261a69..8a34c73f97 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -216,19 +216,16 @@ class releaseModel extends model
                 $this->loadModel('story');
                 $this->loadModel('action');
 
-                $storyIDList = explode(',', $release->stories);
-                $product = $this->loadModel('product')->getById($release->product);
+                $storyIDList = array_filter(explode(',', $release->stories));
+                $product     = $this->loadModel('product')->getById($release->product);
                 foreach($storyIDList as $storyID)
                 {
-                    if($storyID)
-                    {
-                        $this->dao->update(TABLE_STORY)->set('stagedBy')->eq('')->where('id')->eq($storyID)->exec();
-                        if($product and $product->type != 'normal') $this->dao->update(TABLE_STORYSTAGE)->set('stagedBy')->eq('')->where('story')->eq($storyID)->andWhere('branch')->eq($release->branch)->exec();
+                    $this->dao->update(TABLE_STORY)->set('stagedBy')->eq('')->where('id')->eq($storyID)->exec();
+                    if($product and $product->type != 'normal') $this->dao->update(TABLE_STORYSTAGE)->set('stagedBy')->eq('')->where('story')->eq($storyID)->andWhere('branch')->eq($release->branch)->exec();
 
-                        $this->story->setStage($storyID);
+                    $this->story->setStage($storyID);
 
-                        $this->action->create('story', $storyID, 'linked2release', '', $releaseID);
-                    }
+                    $this->action->create('story', $storyID, 'linked2release', '', $releaseID);
                 }
             }