diff --git a/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptFactory.java b/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptFactory.java
index d0dbe00600fe6039f36453ca0ce9141021487155..be551988e812819bd839cb7fc0d1019a2ed26790 100644
--- a/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptFactory.java
+++ b/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptFactory.java
@@ -93,7 +93,7 @@ public class ConceptFactory {
                 Concept object;
                 // either uri or code and vocabulary must be provided
                 if (relatedConcept.getUri() == null) {
-                    object = createByCodeAndVocabularyId(relatedConcept.getCode().toLowerCase(Locale.ROOT), relatedConcept.getVocabulary(), errors);
+                    object = createByCodeAndVocabularyId(relatedConcept.getCode(), relatedConcept.getVocabulary(), errors);
                 } else {
                     object = createByUri(relatedConcept.getUri(), errors);
                 }
@@ -131,14 +131,9 @@ public class ConceptFactory {
                     .code(code).vocabulary(vocabulary.getCode()).build());
 
             if (conceptHolder.isEmpty()) {
-                Optional<Concept> optionalConceptHolder = conceptRepository.findByCodeAndVocabularyCode(code, vocabulary.getCode());
                 // assign error to code field because vocabulary was validated earlier
-                if (optionalConceptHolder.isEmpty()) {
-                    errors.rejectValue("code", "field.notExist", "Concept does not exist.");
-                    return null;
-                }else {
-                    return optionalConceptHolder.get();
-                }
+                errors.rejectValue("code", "field.notExist", "Concept does not exist.");
+                return null;
             }
 
             return conceptHolder.get();
diff --git a/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptPropertyFactory.java b/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptPropertyFactory.java
index 312b81f925324500db133b9a87ac8b10274b350a..900b615465835d25d790e4b4fcb79f0a6664e258 100644
--- a/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptPropertyFactory.java
+++ b/src/main/java/eu/sshopencloud/marketplace/validators/vocabularies/ConceptPropertyFactory.java
@@ -24,7 +24,7 @@ public class ConceptPropertyFactory {
         Concept concept;
         // either uri or code and vocabulary must be provided
         if (conceptId.getUri() == null) {
-            concept = conceptFactory.createByCodeAndVocabularyId(conceptId.getCode().toLowerCase(Locale.ROOT), conceptId.getVocabulary(), errors);
+            concept = conceptFactory.createByCodeAndVocabularyId(conceptId.getCode(), conceptId.getVocabulary(), errors);
         } else {
             concept = conceptFactory.createByUri(conceptId.getUri(), errors);
         }