diff --git a/includes/polling/system.inc.php b/includes/polling/system.inc.php
index db39b2906..fa706e701 100644
--- a/includes/polling/system.inc.php
+++ b/includes/polling/system.inc.php
@@ -74,6 +74,11 @@ if (is_numeric($uptime)) {
         rrdtool_create($uptime_rrd, 'DS:uptime:GAUGE:600:0:U '.$config['rrd_rra']);
     }
 
+    $measurement = 'uptime';
+    echo "BOOM " . sprintf("%.1f",$uptime) . " YAH\n";
+    $fields = array('uptime' => $uptime);
+    influx_update($device,$measurement,$tags,$fields);
+
     rrdtool_update($uptime_rrd, 'N:'.$uptime);
 
     $graphs['uptime'] = true;
diff --git a/includes/rrdtool.inc.php b/includes/rrdtool.inc.php
index 56a50d32f..d2be944a2 100644
--- a/includes/rrdtool.inc.php
+++ b/includes/rrdtool.inc.php
@@ -305,8 +305,8 @@ function rrdtool_escape($string, $maxlength=null){
 }
 
 function influx_update($device,$measurement,$tags=array(),$fields) {
-    $tmp_tags = array();
     $tmp_fields = array();
+    $tmp_tags[] = "host=".$device['hostname'];
     foreach ($tags as $k => $v) {
         $tmp_tags[] = "$k=$v";
     }
@@ -320,7 +320,7 @@ function influx_update($device,$measurement,$tags=array(),$fields) {
     $influx_url = 'http://localhost:8086/write?db=librenms';
 
     $ch = curl_init($influx_url);
-    $post = "$measurement,host=".$device['hostname'].",$tags $fields";
+    $post = "$measurement,$tags $fields";
     curl_setopt($ch, CURLOPT_BINARYTRANSFER, TRUE);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
     $response = curl_exec($ch);