diff --git a/models/v1beta1/component/component_helper.go b/models/v1beta1/component/component_helper.go
index 705ddb5144..5ec0635af4 100644
--- a/models/v1beta1/component/component_helper.go
+++ b/models/v1beta1/component/component_helper.go
@@ -49,6 +49,9 @@ func (c *ComponentDefinition) Create(db *database.Handler, hostID uuid.UUID) (uu
 	}
 
 	if !utils.IsSchemaEmpty(c.Component.Schema) {
+		if c.Metadata.AdditionalProperties == nil {
+			c.Metadata.AdditionalProperties = make(map[string]interface{})
+		}
 		c.Metadata.AdditionalProperties["hasInvalidSchema"] = true
 	}