diff --git a/CHANGELOG.md b/CHANGELOG.md
index 302ca08..e412eae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Fixed
+
+- Improve tag handling: correctly add, update, and remove tags
+
 ## [2.14.1] - 2025-11-20
 
-## Fixed
+### Fixed
 
 - Improve tag handling: correctly add, update, and remove tags
 
diff --git a/inc/tag.class.php b/inc/tag.class.php
index c3a6fee..8d10b72 100644
--- a/inc/tag.class.php
+++ b/inc/tag.class.php
@@ -415,7 +415,7 @@ public static function getSpecificValueToDisplay($field, $values, array $options
     {
         switch ($field) {
             case 'type_menu':
-                $itemtypes = json_decode((string) $values[$field]);
+                $itemtypes = empty($values[$field]) ? [] : json_decode((string) $values[$field], true);
                 if (!is_array($itemtypes)) {
                     return " ";
                 }