diff --git a/docs/bpmn-support.adoc b/docs/bpmn-support.adoc
index a29c56996c..c255355a05 100644
--- a/docs/bpmn-support.adoc
+++ b/docs/bpmn-support.adoc
@@ -149,8 +149,8 @@ The default rendering uses `white` as fill color and `black` as stroke color.
 |
 
 |Message Interrupting Boundary Event
-|
-|
+|icon:check-circle-o[]
+|The stroke & icon width may be adjusted
 |===
 
 
diff --git a/src/component/mxgraph/shape/event-shapes.ts b/src/component/mxgraph/shape/event-shapes.ts
index 4304372a7d..1e74e1b7f6 100644
--- a/src/component/mxgraph/shape/event-shapes.ts
+++ b/src/component/mxgraph/shape/event-shapes.ts
@@ -111,7 +111,7 @@ export class BoundaryEventShape extends IntermediateEventShape {
 
   protected paintOuterShape(paintParameter: PaintParameter): void {
     const isInterrupting = StyleUtils.getBpmnIsInterrupting(this.style);
-    if (isInterrupting === 'true' || isInterrupting === undefined) {
+    if ((isInterrupting === 'true' || isInterrupting === undefined) && StyleUtils.getBpmnEventKind(this.style) === ShapeBpmnEventKind.TIMER) {
       paintParameter.c.setFillColor('yellow');
     } else if (isInterrupting === 'false') {
       paintParameter.c.setFillColor('LightPink');