diff --git a/lib/draw/BpmnRenderer.js b/lib/draw/BpmnRenderer.js
index c01caf62..d5c1518d 100644
--- a/lib/draw/BpmnRenderer.js
+++ b/lib/draw/BpmnRenderer.js
@@ -490,7 +490,10 @@ function BpmnRenderer(eventBus, styles, pathMap, canvas, priority) {
 
   var handlers = this.handlers = {
     'bpmn:Event': function(parentGfx, element, attrs) {
-      attrs.fillOpacity = attrs.fillOpacity || DEFAULT_FILL_OPACITY;
+
+      if (!('fillOpacity' in attrs)) {
+        attrs.fillOpacity = DEFAULT_FILL_OPACITY;
+      }
 
       return drawCircle(parentGfx, element.width, element.height, attrs);
     },
@@ -808,7 +811,10 @@ function BpmnRenderer(eventBus, styles, pathMap, canvas, priority) {
     'bpmn:Activity': function(parentGfx, element, attrs) {
 
       attrs = attrs || {};
-      attrs.fillOpacity = attrs.fillOpacity || DEFAULT_FILL_OPACITY;
+
+      if (!('fillOpacity' in attrs)) {
+        attrs.fillOpacity = DEFAULT_FILL_OPACITY;
+      }
 
       return drawRect(parentGfx, element.width, element.height, TASK_BORDER_RADIUS, attrs);
     },
@@ -1508,7 +1514,8 @@ function BpmnRenderer(eventBus, styles, pathMap, canvas, priority) {
       var attrs = {
         strokeWidth: 1,
         fill: getFillColor(element),
-        stroke: getStrokeColor(element)
+        stroke: getStrokeColor(element),
+        fillOpacity: 1
       };
 
       if (!cancel) {