diff --git a/debug/vector/inherit-dashArray.html b/debug/vector/inherit-dashArray.html
new file mode 100644
index 000000000..438ee5f5f
--- /dev/null
+++ b/debug/vector/inherit-dashArray.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Leaflet debug page</title>
+
+	<link rel="stylesheet" href="../../dist/leaflet.css" />
+
+	<link rel="stylesheet" href="../css/screen.css" />
+
+	<script src="../leaflet-include.js"></script>
+</head>
+<body>
+	<div id="map" style="width: 800px; height: 600px; border: 1px solid #ccc"></div>
+
+	<script>
+		var map = L.map('map', {
+			center: [20, 20],
+			zoom: 3,
+			preferCanvas: true
+		});
+		L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+			minZoom: 1,
+			maxZoom: 17,
+			label: 'open street map'
+		}).addTo(map);
+		var points = [
+                        [0, 0],
+                        [0, 42],
+                        [42, 42],
+                        [0, 0]
+                ];
+                L.polygon([points, []], {dashArray: '5, 5'}).addTo(map);
+                L.circleMarker([42, 0], {color: 'red'}).addTo(map);
+	</script>
+
+</body>
+</html>
diff --git a/debug/vector/vector-canvas.html b/debug/vector/vector-canvas.html
index 7e58097c3..9323f826b 100644
--- a/debug/vector/vector-canvas.html
+++ b/debug/vector/vector-canvas.html
@@ -89,6 +89,14 @@
 
 		polygon.bindPopup('I am a polygon');
 
+		var circleMarker2 = new L.CircleMarker([25.5, 0], {
+			dashArray: '5, 5',
+			fillColor: 'red',
+			color: 'green',
+			renderer: canvas
+		});
+		group.addLayer(circleMarker2);
+
 		map.addLayer(group);
 
 	</script>
diff --git a/src/layer/vector/Canvas.js b/src/layer/vector/Canvas.js
index 428efd0e0..e14540fb7 100644
--- a/src/layer/vector/Canvas.js
+++ b/src/layer/vector/Canvas.js
@@ -271,10 +271,6 @@ export var Canvas = Renderer.extend({
 
 		ctx.beginPath();
 
-		if (ctx.setLineDash) {
-			ctx.setLineDash(layer.options && layer.options._dashArray || []);
-		}
-
 		for (i = 0; i < len; i++) {
 			for (j = 0, len2 = parts[i].length; j < len2; j++) {
 				p = parts[i][j];
@@ -326,6 +322,9 @@ export var Canvas = Renderer.extend({
 		}
 
 		if (options.stroke && options.weight !== 0) {
+			if (ctx.setLineDash) {
+				ctx.setLineDash(layer.options && layer.options._dashArray || []);
+			}
 			ctx.globalAlpha = options.opacity;
 			ctx.lineWidth = options.weight;
 			ctx.strokeStyle = options.color;
