diff --git a/schema/Entity.json b/schema/Entity.json
index 022e2e4c8e2320c5e4623d1cd29b32cd44da723c..7b7fb4f2e1e0e8ad47dbd82081ffe95c10392cbb 100644
--- a/schema/Entity.json
+++ b/schema/Entity.json
@@ -158,10 +158,6 @@
           "$ref": "#/definitions/GeoProperty"
         }
       },
-      "required": [
-        "id",
-        "type"
-      ],
       "additionalProperties": {
         "anyOf": [
           {
@@ -198,7 +194,11 @@
             "modifiedAt": {
               "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/modifiedAt"
             }
-          }
+          },
+          "required": [
+            "id",
+            "type"
+          ]
         },
         {
           "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#/definitions/EntityFragment"