diff --git a/module/story/control.php b/module/story/control.php
index 1c02ef532c..2bc3434095 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -950,6 +950,7 @@ class story extends control
         $this->view->productStories   = $productStories;
         $this->view->branchOption     = $branchOption;
         $this->view->branchTagOption  = $branchTagOption;
+        $this->view->branches         = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($product->id);
         $this->view->reviewers        = array_keys($reviewerList);
         $this->view->reviewedReviewer = $reviewedReviewer;
         $this->view->lastReviewer     = $this->story->getLastReviewer($story->id);
diff --git a/module/story/view/blocksibling.html.php b/module/story/view/blocksibling.html.php
index 7b7152b54e..b5fdc07456 100644
--- a/module/story/view/blocksibling.html.php
+++ b/module/story/view/blocksibling.html.php
@@ -14,7 +14,7 @@ foreach($siblings as $sibling)
 {
     $id         = $sibling->id;
     $title      = '#' . $id . ' '. $sibling->title;
-    $branch     = $branches[$sibling->branch];
+    $branch     = isset($branches[$sibling->branch]) ? $branches[$sibling->branch] : '';
     $stage      = $lang->story->stageList[$sibling->stage];
     $labelClass = $story->branch == $sibling->branch ? 'label-primary' : '';
 
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 2cd17c4cf0..cb81070841 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -109,7 +109,6 @@
             <div class='form-group'>
               <div>
                 <ul class='list-unstyled'>
-                  <?php $branches = $branchTagOption;?>
                   <?php include './blocksibling.html.php';?>
                 </ul>
               </div>