diff --git a/includes/plugins/highcharts.inc b/includes/plugins/highcharts.inc
index fde3d29..b05b273 100644
--- a/includes/plugins/highcharts.inc
+++ b/includes/plugins/highcharts.inc
@@ -42,7 +42,7 @@ class HighchartsHandler implements VisualizationHandlerInterface {
     $x_axis = array();
     if (!empty($options['xAxis']['labelField'])) {
       foreach ($data as $row) {
-        $x_axis[] = strip_tags((string) $row[$options['xAxis']['labelField']]);
+        $x_axis[] = html_entity_decode((string) $row[$options['xAxis']['labelField']], ENT_QUOTES);
       }
     }
 
@@ -73,7 +73,7 @@ class HighchartsHandler implements VisualizationHandlerInterface {
           $value = (int) $row[$name];
 
           if (!empty($column['enabled'])) {
-            $serie->data[] = (object) array('name' => strip_tags($row[$options['xAxis']['labelField']]), 'y' => $value);
+            $serie->data[] = (object) array('name' => html_entity_decode($row[$options['xAxis']['labelField']], ENT_QUOTES), 'y' => $value);
           }
           else {
             $serie->data[] = $value;