diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index a22b161bd..21d6b3f24 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -962,6 +962,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'Menu:TagAdminMenu' => 'Tags configuration',
 	'Menu:TagAdminMenu+' => 'Tags values management',
 	'UI:TagAdminMenu:Title' => 'Tags configuration',
+	'UI:TagAdminMenu:NoTags' => 'No Tag field configured',
 	'UI:TagSetFieldData:Error' => 'Error: %1$s',
 
 	'Menu:AuditCategories' => 'Audit Categories', // Duplicated into itop-welcome-itil (will be removed from here...)
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 785626432..c0802bfac 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1359,6 +1359,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'Menu:TagAdminMenu' => 'Etiquettes',
 	'Menu:TagAdminMenu+' => 'Gestion des étiquettes',
 	'UI:TagAdminMenu:Title' => 'Gestion des étiquettes',
+	'UI:TagAdminMenu:NoTags' => 'Pas de champ étiquette configuré',
 	'UI:TagSetFieldData:Error' => 'Erreur: %1$s',
 ));
 
diff --git a/pages/tagadmin.php b/pages/tagadmin.php
index 7652ae9ff..997e0944d 100644
--- a/pages/tagadmin.php
+++ b/pages/tagadmin.php
@@ -105,7 +105,7 @@ try
 		$oP->P("<b>".Dict::Format('UI:TagSetFieldData:Error', $e->getHtmlDesc())."</b>");
 	}
 
-	if ($oFilter != null)
+	if (!empty($oFilter))
 	{
 		$oSet = new CMDBObjectSet($oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
@@ -125,6 +125,12 @@ try
 		$sFilter = $oFilter->ToOQL();
 		$oP->add("\n<!-- $sFilter -->\n");
 	}
+	else
+	{
+		$oP->add("<p>");
+		$oP->add(Dict::S('UI:TagAdminMenu:NoTags'));
+		$oP->add("</p>");
+	}
 	$oP->add("</div>\n");
 
 	$oP->output();