diff --git a/rules/camunda-cloud/implementation/config.js b/rules/camunda-cloud/implementation/config.js
index 163b8c3e..c7468054 100644
--- a/rules/camunda-cloud/implementation/config.js
+++ b/rules/camunda-cloud/implementation/config.js
@@ -7,6 +7,9 @@ module.exports = {
     'bpmn:IntermediateThrowEvent': {
       'bpmn:MessageEventDefinition': '1.2'
     },
+    'bpmn:EndEvent': {
+      'bpmn:MessageEventDefinition': '1.2'
+    },
     'bpmn:ScriptTask': '1.1',
     'bpmn:SendTask': '1.1',
     'bpmn:ServiceTask': '1.0'
diff --git a/test/camunda-cloud/implementation.spec.js b/test/camunda-cloud/implementation.spec.js
index 8cba03a9..1c775361 100644
--- a/test/camunda-cloud/implementation.spec.js
+++ b/test/camunda-cloud/implementation.spec.js
@@ -64,6 +64,18 @@ const valid = [
       </bpmn:intermediateThrowEvent>
     `))
   },
+  {
+    name: 'message end event (Camunda Cloud 1.2)',
+    config: { version: '1.2' },
+    moddleElement: createModdle(createProcess(`
+      <bpmn:endEvent id="EndEvent_1">
+        <bpmn:extensionElements>
+          <zeebe:taskDefinition type="foo" />
+        </bpmn:extensionElements>
+        <bpmn:messageEventDefinition id="MessageEventDefinition_1" />
+      </bpmn:endEvent>
+    `))
+  },
   {
     name: 'task (Camunda Cloud 1.2)',
     config: { version: '1.2' },
@@ -302,6 +314,54 @@ const invalid = [
       }
     }
   },
+  {
+    name: 'message end event (no task definition) (Camunda Cloud 1.2)',
+    config: { version: '1.2' },
+    moddleElement: createModdle(createProcess(`
+      <bpmn:endEvent id="EndEvent_1">
+        <bpmn:messageEventDefinition id="MessageEventDefinition_1" />
+      </bpmn:endEvent>
+    `)),
+    report: {
+      id: 'EndEvent_1',
+      message: 'Element of type <bpmn:EndEvent> must have one extension element of type <zeebe:TaskDefinition>',
+      path: [],
+      data: {
+        type: ERROR_TYPES.EXTENSION_ELEMENT_REQUIRED,
+        node: 'EndEvent_1',
+        parentNode: null,
+        requiredExtensionElement: 'zeebe:TaskDefinition'
+      }
+    }
+  },
+  {
+    name: 'message end event (no task definition type) (Camunda Cloud 1.2)',
+    config: { version: '1.2' },
+    moddleElement: createModdle(createProcess(`
+        <bpmn:endEvent id="EndEvent_1">
+          <bpmn:extensionElements>
+            <zeebe:taskDefinition />
+          </bpmn:extensionElements>
+          <bpmn:messageEventDefinition id="MessageEventDefinition_1" />
+        </bpmn:endEvent>
+      `)),
+    report: {
+      id: 'EndEvent_1',
+      message: 'Element of type <zeebe:TaskDefinition> must have property <type>',
+      path: [
+        'extensionElements',
+        'values',
+        0,
+        'type'
+      ],
+      data: {
+        type: ERROR_TYPES.PROPERTY_REQUIRED,
+        node: 'zeebe:TaskDefinition',
+        parentNode: 'EndEvent_1',
+        requiredProperty: 'type'
+      }
+    }
+  },
   {
     name: 'service task (no task definition) (Camunda Cloud 1.3)',
     config: { version: '1.3' },