diff --git a/definitions/3.0.0/messageObject.json b/definitions/3.0.0/messageObject.json
index 3415b230..38339942 100644
--- a/definitions/3.0.0/messageObject.json
+++ b/definitions/3.0.0/messageObject.json
@@ -154,6 +154,90 @@
       }
     }
   },
+  "allOf": [
+    {
+      "if": {
+        "not": {
+          "required": [
+            "schemaFormat"
+          ]
+        }
+      },
+      "then": {
+        "properties": {
+          "payload": {
+            "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "required": [
+          "schemaFormat"
+        ],
+        "properties": {
+          "schemaFormat": {
+            "enum": [
+              "application/vnd.aai.asyncapi;version=2.0.0",
+              "application/vnd.aai.asyncapi+json;version=2.0.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.0.0",
+              "application/vnd.aai.asyncapi;version=2.1.0",
+              "application/vnd.aai.asyncapi+json;version=2.1.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.1.0",
+              "application/vnd.aai.asyncapi;version=2.2.0",
+              "application/vnd.aai.asyncapi+json;version=2.2.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.2.0",
+              "application/vnd.aai.asyncapi;version=2.3.0",
+              "application/vnd.aai.asyncapi+json;version=2.3.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.3.0",
+              "application/vnd.aai.asyncapi;version=2.4.0",
+              "application/vnd.aai.asyncapi+json;version=2.4.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.4.0",
+              "application/vnd.aai.asyncapi;version=2.5.0",
+              "application/vnd.aai.asyncapi+json;version=2.5.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.5.0",
+              "application/vnd.aai.asyncapi;version=2.6.0",
+              "application/vnd.aai.asyncapi+json;version=2.6.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.6.0",
+              "application/vnd.aai.asyncapi;version=3.0.0",
+              "application/vnd.aai.asyncapi+json;version=3.0.0",
+              "application/vnd.aai.asyncapi+yaml;version=3.0.0"
+            ]
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "payload": {
+            "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
+          }
+        }
+      }
+    },
+    {
+      "if": {
+        "required": [
+          "schemaFormat"
+        ],
+        "properties": {
+          "schemaFormat": {
+            "enum": [
+              "application/schema+json;version=draft-07",
+              "application/schema+yaml;version=draft-07"
+            ]
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "payload": {
+            "$ref": "http://json-schema.org/draft-07/schema"
+          }
+        }
+      }
+    }
+  ],
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "http://asyncapi.com/definitions/3.0.0/messageObject.json"
 }
\ No newline at end of file