diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index 80267a18e9..505163d14e 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -2846,8 +2846,11 @@ function get_donut_module_data($id_module)
 
     $values_to_return = [];
     foreach ($values as $val) {
-        $data = explode(',', $val);
+        if (empty($val) === true) {
+            continue;
+        }
 
+        $data = explode(',', $val);
         if ($data[0] === $val) {
             continue;
         }
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php b/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php
index 83a09866e0..53c90fe2e6 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php
@@ -160,9 +160,6 @@ final class DonutGraph extends Item
             if (empty($graphData) === true) {
                 $data['html'] = graph_nodata_image(['width' => $width, 'height' => $height]);
             } else {
-                array_pop($graphData['labels']);
-                array_pop($graphData['data']);
-
                 $options = [
                     'waterMark' => false,
                     'legend'    => [
@@ -226,7 +223,7 @@ final class DonutGraph extends Item
                     'module_input'            => true,
                     'module_name'             => 'moduleId',
                     'module_none'             => false,
-                    'get_only_string_modules' => false,
+                    'get_only_string_modules' => true,
                 ],
             ];
 
@@ -241,7 +238,7 @@ final class DonutGraph extends Item
                     'sort'                    => false,
                     'agent_id'                => $values['agentId'],
                     'metaconsole_id'          => $values['metaconsoleId'],
-                    'get_only_string_modules' => false,
+                    'get_only_string_modules' => true,
                 ],
             ];