diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index a39bd69d97..61777fe515 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -558,12 +558,6 @@ EOF
 			$oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData());
 
 			$iCount = $oLinkSet->Count();
-			$sCount = '';
-			if ($iCount != 0)
-			{
-				$sCount = " ($iCount)";
-			}
-			$oPage->SetCurrentTab('Class:'.$sClass.'/Attribute:'.$sAttCode, $oAttDef->GetLabel().$sCount);
 			if ($this->IsNew())
 			{
 				$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
@@ -609,6 +603,9 @@ EOF
 				continue;
 			}
 
+			$sCount = ($iCount != 0) ? " ($iCount)" : "";
+			$oPage->SetCurrentTab('Class:'.$sClass.'/Attribute:'.$sAttCode, $oAttDef->GetLabel().$sCount);
+
 			$aArgs = array('this' => $this);
 			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE));
 			if ($bEditMode && (!$bReadOnly))
diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php
index 746ba9083d..efd63088fe 100644
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -1547,6 +1547,12 @@ class TabManager
 					{
 						unset($aTabs['tabs'][$sTabCode]);
 					}
+
+					// N°3320: Do not display empty tabs
+					if (empty($aTabData['html']))
+					{
+						unset($aTabs['tabs'][$sTabCode]);
+					}
 				}
 
 				// Render tabs