diff --git a/html/includes/graphs/generic_data.inc.php b/html/includes/graphs/generic_data.inc.php
index 047524ff96..f55e2968e0 100644
--- a/html/includes/graphs/generic_data.inc.php
+++ b/html/includes/graphs/generic_data.inc.php
@@ -85,15 +85,17 @@ $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 .= ' CDEF:d95thoutn=doutbits,-1,* VDEF:d95thoutn95=d95thoutn,95,PERCENT CDEF:d95thoutn95n=doutbits,doutbits,-,d95thoutn95,-1,*,+ VDEF:d95thout=d95thoutn95n,FIRST';
 
 if ($format == 'octets' || $format == 'bytes') {
+    $rrd_options .= ' VDEF:95thin=inoctets,95,PERCENT';
+    $rrd_options .= ' VDEF:95thout=outoctets,95,PERCENT';
     $units  = 'Bps';
     $format = 'octets';
 }
 else {
+    $rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
+    $rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
     $units  = 'bps';
     $format = 'bits';
 }