diff --git a/module/bug/model.php b/module/bug/model.php
index 4b8abe39ea..9ff6b81d69 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2693,10 +2693,15 @@ class bugModel extends model
             if($this->session->bugQuery == false) $this->session->set('bugQuery', ' 1 = 1');
         }
 
-        $bugQuery = $this->getBugQuery($this->session->bugQuery, $productIDList, $branch);
+        $bugQuery = $this->getBugQuery($this->session->bugQuery);
+
         if(is_array($productIDList)) $productIDList = implode(',', $productIDList);
         if(strpos($bugQuery, '`product` =') === false) $bugQuery .= ' AND `product` in (' . $productIDList . ')';
 
+        $allBranch = "`branch` = 'all'";
+        if($branch !== 'all' and strpos($bugQuery, '`branch` =') === false) $bugQuery .= " AND `branch` in('0','$branch')";
+        if(strpos($bugQuery, $allBranch) !== false) $bugQuery = str_replace($allBranch, '1', $bugQuery);
+
         $bugs = $this->dao->select('*')->from(TABLE_BUG)->where($bugQuery)
             ->beginIF(!$this->app->user->admin)->andWhere('execution')->in('0,' . $this->app->user->view->sprints)->fi()
             ->beginIF($excludeBugs)->andWhere('id')->notIN($excludeBugs)->fi()
@@ -2717,11 +2722,10 @@ class bugModel extends model
      * Get bug query.
      *
      * @param  string $bugQuery
-     * @param  string $branch
      * @access public
      * @return string
      */
-    public function getBugQuery($bugQuery, $branch = 'all')
+    public function getBugQuery($bugQuery)
     {
         $allProduct = "`product` = 'all'";
         if(strpos($bugQuery, $allProduct) !== false)
@@ -2731,10 +2735,6 @@ class bugModel extends model
             $bugQuery = $bugQuery . ' AND `product` ' . helper::dbIN($products);
         }
 
-        $allBranch = "`branch` = 'all'";
-        if($branch !== 'all' and strpos($bugQuery, '`branch` =') === false) $bugQuery .= " AND `branch` in('0','$branch')";
-        if(strpos($bugQuery, $allBranch) !== false) $bugQuery = str_replace($allBranch, '1', $bugQuery);
-
         $allProject = "`project` = 'all'";
         if(strpos($bugQuery, $allProject) !== false)
         {