diff --git a/html/includes/graphs/sensor/frequency.inc.php b/html/includes/graphs/sensor/frequency.inc.php
index 332a9e289592..d884ba42d1f6 100644
--- a/html/includes/graphs/sensor/frequency.inc.php
+++ b/html/includes/graphs/sensor/frequency.inc.php
@@ -6,7 +6,7 @@
 
 $rrd_options .= " COMMENT:'                                 Last   Max\\n'";
 
-$sensor['sensor_descr_fixed'] = substr(str_pad($sensor['sensor_descr'], 28), 0, 28);
+$sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 28);
 
 $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
 $rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
diff --git a/html/includes/graphs/sensor/signal.inc.php b/html/includes/graphs/sensor/signal.inc.php
index 7401339ce829..7c911ae1c5d6 100644
--- a/html/includes/graphs/sensor/signal.inc.php
+++ b/html/includes/graphs/sensor/signal.inc.php
@@ -5,7 +5,7 @@
 
 $rrd_options .= " COMMENT:'                       Min       Last      Max\\n'";
 
-$sensor['sensor_descr_fixed'] = substr(str_pad($sensor['sensor_descr'], 18), 0, 18);
+$sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 18);
 
 $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
 $rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";
diff --git a/html/includes/graphs/sensor/snr.inc.php b/html/includes/graphs/sensor/snr.inc.php
index edba2fc3ac0b..e514a8c81c45 100644
--- a/html/includes/graphs/sensor/snr.inc.php
+++ b/html/includes/graphs/sensor/snr.inc.php
@@ -6,7 +6,7 @@
 
 $rrd_options .= " COMMENT:'                       Min       Last      Max\\n'";
 
-$sensor['sensor_descr_fixed'] = substr(str_pad($sensor['sensor_descr'], 18), 0, 18);
+$sensor['sensor_descr_fixed'] = rrdtool_escape($sensor['sensor_descr'], 18);
 
 $rrd_options .= " DEF:sensor=$rrd_filename:sensor:AVERAGE";
 $rrd_options .= " LINE1.5:sensor#cc0000:'".$sensor['sensor_descr_fixed']."'";