diff --git a/module/execution/control.php b/module/execution/control.php
index c8b48d451b..defae0bac5 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2158,6 +2158,11 @@ class execution extends control
             unset($this->lang->kanban->type['all']);
         }
 
+        if($execution->type == 'stage' and $execution->attribute != 'dev')
+        {
+            unset($this->lang->kanban->type['task']);
+        }
+
         $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy);
         if(empty($kanbanGroup))
         {
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 3646c208db..01357a147d 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1316,12 +1316,15 @@ class kanbanModel extends model
      */
     public function getExecutionKanban($executionID, $browseType = 'all', $groupBy = 'default')
     {
+        $execution = $this->loadModel('execution')->getById($executionID);
+
         if($groupBy != 'default') return $this->getKanban4Group($executionID, $browseType, $groupBy);
 
         $lanes = $this->dao->select('*')->from(TABLE_KANBANLANE)
             ->where('execution')->eq($executionID)
             ->andWhere('deleted')->eq(0)
             ->beginIF($browseType != 'all')->andWhere('type')->eq($browseType)->fi()
+            ->beginIF($execution->type == 'stage' and $execution->attribute != 'dev')->andWhere('type')->ne('task')->fi()
             ->orderBy('order_asc')
             ->fetchAll('id');