diff --git a/html/includes/graphs/generic_data.inc.php b/html/includes/graphs/generic_data.inc.php
index e13fce80c..dbd79a1df 100644
--- a/html/includes/graphs/generic_data.inc.php
+++ b/html/includes/graphs/generic_data.inc.php
@@ -78,16 +78,16 @@ $rrd_options .= ' CDEF:inbits_max=inoctets_max,8,*';
 
 if ($config['rrdgraph_real_95th']) {
     $rrd_options .= ' CDEF:highbits=inoctets,outoctets,MAX,8,*';
-    $rrd_options .= ' VDEF:95thhigh=highbits,95,PERCENT';
+    $rrd_options .= ' VDEF:95thhigh=highbits,95,PERCENTNAN';
 }
 
 $rrd_options .= ' VDEF:totin=inoctets,TOTAL';
 $rrd_options .= ' VDEF:totout=outoctets,TOTAL';
 $rrd_options .= ' VDEF:tot=octets,TOTAL';
 
-$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
-$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
-$rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT';
+$rrd_options .= ' VDEF:95thin=inbits,95,PERCENTNAN';
+$rrd_options .= ' VDEF:95thout=outbits,95,PERCENTNAN';
+$rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENTNAN';
 
 if ($format == 'octets' || $format == 'bytes') {
     $units  = 'Bps';
diff --git a/html/includes/graphs/generic_multi_bits.inc.php b/html/includes/graphs/generic_multi_bits.inc.php
index caa765e4d..4775178b2 100644
--- a/html/includes/graphs/generic_multi_bits.inc.php
+++ b/html/includes/graphs/generic_multi_bits.inc.php
@@ -55,9 +55,9 @@ if ($i) {
     $rrd_options .= ' CDEF:inbits=inoctets,8,*';
     $rrd_options .= ' CDEF:outbits=outoctets,8,*';
     $rrd_options .= ' CDEF:doutbits=doutoctets,8,*';
-    $rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
-    $rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
-    $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT';
+    $rrd_options .= ' VDEF:95thin=inbits,95,PERCENTNAN';
+    $rrd_options .= ' VDEF:95thout=outbits,95,PERCENTNAN';
+    $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENTNAN';
 
     if ($_GET['previous'] == 'yes') {
         $rrd_options .= ' CDEF:'.$in.'octetsX='.$in_thingX.$pluses;
@@ -66,9 +66,9 @@ if ($i) {
         $rrd_options .= ' CDEF:inbitsX=inoctetsX,8,*';
         $rrd_options .= ' CDEF:outbitsX=outoctetsX,8,*';
         $rrd_options .= ' CDEF:doutbitsX=doutoctetsX,8,*';
-        $rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENT';
-        $rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENT';
-        $rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENT';
+        $rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENTNAN';
+        $rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENTNAN';
+        $rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENTNAN';
     }
 
     if ($legend == 'no' || $legend == '1') {
diff --git a/html/includes/graphs/generic_multi_data.inc.php b/html/includes/graphs/generic_multi_data.inc.php
index 90f5c908e..1557eae3c 100644
--- a/html/includes/graphs/generic_multi_data.inc.php
+++ b/html/includes/graphs/generic_multi_data.inc.php
@@ -64,9 +64,9 @@ if ($i) {
     $rrd_options .= ' CDEF:inbits=inoctets,8,*';
     $rrd_options .= ' CDEF:outbits=outoctets,8,*';
     $rrd_options .= ' CDEF:doutbits=doutoctets,8,*';
-    $rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
-    $rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
-    $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT';
+    $rrd_options .= ' VDEF:95thin=inbits,95,PERCENTNAN';
+    $rrd_options .= ' VDEF:95thout=outbits,95,PERCENTNAN';
+    $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENTNAN';
 
     if ($_GET['previous'] == 'yes') {
         $rrd_options .= ' CDEF:'.$in.'octetsX='.$in_thingX.$pluses;
@@ -75,9 +75,9 @@ if ($i) {
         $rrd_options .= ' CDEF:inbitsX=inoctetsX,8,*';
         $rrd_options .= ' CDEF:outbitsX=outoctetsX,8,*';
         $rrd_options .= ' CDEF:doutbitsX=doutoctetsX,8,*';
-        $rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENT';
-        $rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENT';
-        $rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENT';
+        $rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENTNAN';
+        $rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENTNAN';
+        $rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENTNAN';
     }
 
     if ($legend == 'no' || $legend == '1') {
diff --git a/html/includes/graphs/generic_multi_data_separated.inc.php b/html/includes/graphs/generic_multi_data_separated.inc.php
index 7865d03de..9d28ba3c7 100644
--- a/html/includes/graphs/generic_multi_data_separated.inc.php
+++ b/html/includes/graphs/generic_multi_data_separated.inc.php
@@ -109,9 +109,9 @@ if (!$nototal) {
     $rrd_options .= ' CDEF:outbits=outoctets,8,*';
     $rrd_options .= ' CDEF:doutbits=doutoctets,8,*';
 
-    $rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
-    $rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
-    $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT';
+    $rrd_options .= ' VDEF:95thin=inbits,95,PERCENTNAN';
+    $rrd_options .= ' VDEF:95thout=outbits,95,PERCENTNAN';
+    $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENTNAN';
 
     $rrd_options .= ' VDEF:totin=inoctets,TOTAL';
     $rrd_options .= ' VDEF:totout=outoctets,TOTAL';
diff --git a/html/includes/graphs/generic_multi_seperated.inc.php b/html/includes/graphs/generic_multi_seperated.inc.php
index 9b37f3751..11b722b22 100644
--- a/html/includes/graphs/generic_multi_seperated.inc.php
+++ b/html/includes/graphs/generic_multi_seperated.inc.php
@@ -109,9 +109,9 @@ if ($_GET['previous'] == 'yes') {
     $rrd_options .= ' CDEF:outbitsX=outBX,8,*';
     $rrd_options .= ' CDEF:bitsX=inbitsX,outbitsX,+';
     $rrd_options .= ' CDEF:doutbitsX=doutBX,8,*';
-    $rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENT';
-    $rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENT';
-    $rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENT';
+    $rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENTNAN';
+    $rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENTNAN';
+    $rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENTNAN';
 }
 
 if ($_GET['previous'] == 'yes') {
@@ -130,9 +130,9 @@ if (!$args['nototal']) {
     $rrd_options .= ' CDEF:outbits=outB,8,*';
     $rrd_options .= ' CDEF:bits=inbits,outbits,+';
     $rrd_options .= ' CDEF:doutbits=doutB,8,*';
-    $rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
-    $rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
-    $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT';
+    $rrd_options .= ' VDEF:95thin=inbits,95,PERCENTNAN';
+    $rrd_options .= ' VDEF:95thout=outbits,95,PERCENTNAN';
+    $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENTNAN';
     $rrd_options .= ' VDEF:totin=inB,TOTAL';
     $rrd_options .= ' VDEF:avein=inbits,AVERAGE';
     $rrd_options .= ' VDEF:totout=outB,TOTAL';