diff --git a/smoothie.js b/smoothie.js
index 9486b87..c7b47ab 100644
--- a/smoothie.js
+++ b/smoothie.js
@@ -915,7 +915,7 @@
 
       // Delete old data that's moved off the left of the chart.
       timeSeries.dropOldData(oldestValidTime, chartOptions.maxDataSetLength);
-      if (timeSeries.disabled) {
+      if (timeSeries.disabled || dataSet.length <= 1) {
           continue;
       }
       context.save();
@@ -930,7 +930,7 @@
       context.beginPath();
       // Retain lastX, lastY for calculating the control points of bezier curves.
       var firstX = 0, firstY = 0, lastX = 0, lastY = 0;
-      for (var i = 0; i < dataSet.length && dataSet.length !== 1; i++) {
+      for (var i = 0; i < dataSet.length; i++) {
         var x = timeToXPixel(dataSet[i][0]),
             y = valueToYPixel(dataSet[i][1]);
 
@@ -978,27 +978,26 @@
         lastX = x; lastY = y;
       }
 
-      if (dataSet.length > 1) {
-        if (seriesOptions.fillStyle) {
-          // Close up the fill region.
-          if (chartOptions.scrollBackwards) {
-            context.lineTo(lastX, dimensions.height + seriesOptions.lineWidth);
-            context.lineTo(firstX, dimensions.height + seriesOptions.lineWidth);
-            context.lineTo(firstX, firstY);
-          } else {
-            context.lineTo(dimensions.width + seriesOptions.lineWidth + 1, lastY);
-            context.lineTo(dimensions.width + seriesOptions.lineWidth + 1, dimensions.height + seriesOptions.lineWidth + 1);
-            context.lineTo(firstX, dimensions.height + seriesOptions.lineWidth);
-          }
-          context.fillStyle = seriesOptions.fillStyle;
-          context.fill();
+      if (seriesOptions.fillStyle) {
+        // Close up the fill region.
+        if (chartOptions.scrollBackwards) {
+          context.lineTo(lastX, dimensions.height + seriesOptions.lineWidth);
+          context.lineTo(firstX, dimensions.height + seriesOptions.lineWidth);
+          context.lineTo(firstX, firstY);
+        } else {
+          context.lineTo(dimensions.width + seriesOptions.lineWidth + 1, lastY);
+          context.lineTo(dimensions.width + seriesOptions.lineWidth + 1, dimensions.height + seriesOptions.lineWidth + 1);
+          context.lineTo(firstX, dimensions.height + seriesOptions.lineWidth);
         }
+        context.fillStyle = seriesOptions.fillStyle;
+        context.fill();
+      }
 
-        if (seriesOptions.strokeStyle && seriesOptions.strokeStyle !== 'none') {
-          context.stroke();
-        }
-        context.closePath();
+      if (seriesOptions.strokeStyle && seriesOptions.strokeStyle !== 'none') {
+        context.stroke();
       }
+      context.closePath();
+
       context.restore();
     }