diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12911074f1c..68a50c5e56c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ vNext
   Options are now reloaded correctly and there are no multiple renders/refresh inbetween (#447),
   After an option is changed and a nested template param is also reloaded, if the current value
   exists after the options are reloaded the current selected value is kept (Closes #447, Closes #412)
+- Legend Current value did not display when value was zero, Fixes #460
 
 # 1.5.4 (2014-05-13)
 ### New features and improvements
diff --git a/src/app/panels/graphite/timeSeries.js b/src/app/panels/graphite/timeSeries.js
index 9d4fad7f6e4..1eec0f72e7e 100644
--- a/src/app/panels/graphite/timeSeries.js
+++ b/src/app/panels/graphite/timeSeries.js
@@ -60,11 +60,11 @@ function (_, kbn) {
       this.info.current = result[result.length-1][1];
 
       var formater = kbn.getFormatFunction(yFormats[this.yaxis - 1], 2);
-      this.info.avg = this.info.avg ? formater(this.info.avg) : null;
-      this.info.current = this.info.current ? formater(this.info.current) : null;
-      this.info.min = this.info.min ? formater(this.info.min) : null;
-      this.info.max = this.info.max ? formater(this.info.max) : null;
-      this.info.total = this.info.total ? formater(this.info.total) : null;
+      this.info.avg = this.info.avg != null ? formater(this.info.avg) : null;
+      this.info.current = this.info.current != null ? formater(this.info.current) : null;
+      this.info.min = this.info.min != null ? formater(this.info.min) : null;
+      this.info.max = this.info.max != null ? formater(this.info.max) : null;
+      this.info.total = this.info.total != null ? formater(this.info.total) : null;
     }
 
     return result;
diff --git a/tasks/default_task.js b/tasks/default_task.js
index 905106ec0ba..e42843caa7c 100644
--- a/tasks/default_task.js
+++ b/tasks/default_task.js
@@ -1,5 +1,5 @@
 // Lint and build CSS
 module.exports = function(grunt) {
-  grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src', 'concat']);
+  grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src', 'concat:css']);
   grunt.registerTask('test', ['default', 'karma:test']);
 };