diff --git a/includes/graphite.inc.php b/includes/graphite.inc.php
index 0d9a71be58..8c142e46f3 100644
--- a/includes/graphite.inc.php
+++ b/includes/graphite.inc.php
@@ -36,6 +36,8 @@ function graphite_update($device, $measurement, $tags, $fields)
 
         foreach ($fields as $k => $v) {
             $metric = implode(".", array_filter(array($graphite_prefix, $hostname, $measurement, $ms_name, $k)));
+            // Further sanitize the full metric before sending, whitespace isn't allowed
+            $metric = preg_replace('/\s+/', '_', $metric);
             $line = implode(" ", array($metric, $v, $timestamp));
             d_echo("Sending $line\n");
             fwrite($graphite, $line . "\n");