diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java
index bce19e96a5..3c69a6e32c 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java
@@ -206,12 +206,12 @@ public class BgGraphBuilder {
         List<PointValue> pointValues = new ArrayList<PointValue>();
 
         for (BolusWatchData bwd: bolusWatchDataList) {
-            if(bwd.date > start_time && !bwd.isSMB && bwd.isValid && bwd.bolus > 0) {
+            if(bwd.date > start_time && bwd.date <= end_time && !bwd.isSMB && bwd.isValid && bwd.bolus > 0) {
                 pointValues.add(new PointValue(fuzz(bwd.date), (float) offset-2));
             }
         }
         Line line = new Line(pointValues);
-        line.setColor(bolusInvalidColor);
+        line.setColor(basalCenterColor);
         line.setHasLines(false);
         line.setPointRadius(pointSize*2);
         line.setHasPoints(true);
@@ -223,7 +223,7 @@ public class BgGraphBuilder {
         List<PointValue> pointValues = new ArrayList<PointValue>();
 
         for (BolusWatchData bwd: bolusWatchDataList) {
-            if(bwd.date > start_time && bwd.isSMB && bwd.isValid && bwd.bolus > 0) {
+            if(bwd.date > start_time && bwd.date <= end_time && bwd.isSMB && bwd.isValid && bwd.bolus > 0) {
                 pointValues.add(new PointValue(fuzz(bwd.date), (float) offset-2));
             }
         }
@@ -240,7 +240,7 @@ public class BgGraphBuilder {
         List<PointValue> pointValues = new ArrayList<PointValue>();
 
         for (BolusWatchData bwd: bolusWatchDataList) {
-            if(!(bwd.isValid && bwd.bolus > 0)) {
+            if(bwd.date > start_time && bwd.date <= end_time && !(bwd.isValid && bwd.bolus > 0)) {
                 pointValues.add(new PointValue(fuzz(bwd.date), (float) offset-2));
             }
         }