diff --git a/lib/dao/dao.class.php b/lib/dao/dao.class.php
index 87a6f45cdd..1bada1e42b 100644
--- a/lib/dao/dao.class.php
+++ b/lib/dao/dao.class.php
@@ -242,18 +242,18 @@ class dao extends baseDAO
             {
                 $productID = $_SESSION[$productVar];
                 $result    = $this->dbh->query('SELECT `workflowGroup`, `shadow` FROM ' . TABLE_PRODUCT . " WHERE `id` = '" . $productID . "'")->fetch(PDO::FETCH_OBJ);
-                $groupID   = !$result->shadow ? $result->workflowGroup : 0;
-                if(empty($groupID))
+                $groupID   = !empty($result->workflowGroup) ? $result->workflowGroup : 0;
+                if(!empty($result->shadow))
                 {
                     $result  = $this->dbh->query("SELECT t2.`workflowGroup` FROM " . TABLE_PROJECTPRODUCT . " AS t1 LEFT JOIN " . TABLE_PROJECT . " AS t2 ON t1.project = t2.id WHERE t1.product = '{$productID}'")->fetch(PDO::FETCH_OBJ);
-                    $groupID = $result->workflowGroup;
+                    $groupID = !empty($result->workflowGroup) ? $result->workflowGroup : 0;
                 }
             }
         }
         elseif(!empty($_SESSION['project']) && in_array($module, $linkProjectModules))
         {
             $result  = $this->dbh->query('SELECT `workflowGroup` FROM ' . TABLE_PROJECT . " WHERE `id` = '" . $_SESSION['project'] . "'")->fetch(PDO::FETCH_OBJ);
-            $groupID = $result->workflowGroup;
+            $groupID = !empty($result->workflowGroup) ? $result->workflowGroup : 0;
         }
 
         $flowAction = $this->dbh->query("SELECT * FROM " . TABLE_WORKFLOWACTION . " WHERE `module` = '{$module}' AND `action` = '{$method}' AND `buildin` = '1' AND `extensionType` = 'extend' AND `vision` = '{$this->config->vision}' AND `group` = '{$groupID}'")->fetch(PDO::FETCH_OBJ);