diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index d261764f1c8..78d58062d4c 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -45,10 +45,12 @@ print '<tr class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabl
 print '<td>';
 if ($res) {
 	print $tmpproduct->getNomUrl(1);
-	print ' '.$langs->trans("or").' ';
-	print $tmpbom->getNomUrl(1);
-	print ' <a class="collapse_bom" id="collapse-'.$line->id.'" href="#">';
-	print (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? img_picto('', 'folder') : img_picto('', 'folder-open'));
+	if($tmpbom->id) {
+		print ' ' . $langs->trans("or") . ' ';
+		print $tmpbom->getNomUrl(1);
+		print ' <a class="collapse_bom" id="collapse-' . $line->id . '" href="#">';
+		print (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? img_picto('', 'folder') : img_picto('', 'folder-open'));
+	}
 	print '</a>';
 } else {
 	print $this->tpl['label'];
@@ -92,6 +94,7 @@ $resql = $this->db->query($sql);
 if ($resql) {
 	// Loop on all the sub-BOM lines if they exist
 	while ($obj = $this->db->fetch_object($resql)) {
+
 		$sub_bom_product = new Product($this->db);
 		$sub_bom_product->fetch($obj->fk_product);
 		$sub_bom_product->load_stock();