diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
index fff3f51c3c..4b8019342f 100644
--- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
@@ -341,6 +341,7 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame =
     }
   }
 
+  renderByGeometryType:
   for (type in featuresToRender) {
     groups = layer.groupFeaturesBySymbolizerLiteral(featuresToRender[type]);
     numGroups = groups.length;
@@ -350,12 +351,13 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame =
           /** @type {ol.geom.GeometryType} */ (type),
           group[0], group[1]);
       if (deferred) {
-        break;
+        break renderByGeometryType;
       }
     }
-    if (!deferred) {
-      goog.object.extend(tilesToRender, tilesOnSketchCanvas);
-    }
+  }
+
+  if (!deferred) {
+    goog.object.extend(tilesToRender, tilesOnSketchCanvas);
   }
 
   for (key in tilesToRender) {
diff --git a/src/ol/renderer/canvas/canvasvectorrenderer.js b/src/ol/renderer/canvas/canvasvectorrenderer.js
index 4eeb7004da..29d87fb035 100644
--- a/src/ol/renderer/canvas/canvasvectorrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorrenderer.js
@@ -379,7 +379,6 @@ ol.renderer.canvas.VectorRenderer.renderIcon = function(icon, opt_callback) {
             opt_callback),
         false, ol.renderer.canvas.VectorRenderer.renderIcon);
     image.setAttribute('src', url);
-    ol.renderer.canvas.VectorRenderer.icons_[url] = image;
   } else if (!goog.isNull(image)) {
     var width = icon.width,
         height = icon.height;