diff --git a/validator/src/main/java/org/mustangproject/validator/XMLValidator.java b/validator/src/main/java/org/mustangproject/validator/XMLValidator.java
index 9202b91f..6f364751 100644
--- a/validator/src/main/java/org/mustangproject/validator/XMLValidator.java
+++ b/validator/src/main/java/org/mustangproject/validator/XMLValidator.java
@@ -374,12 +374,14 @@ public class XMLValidator extends Validator {
 
 				}
 
-				if (context.getFormat().equals("CII")) {
+				if (context.getFormat().equals("CII") && (context.getGeneration().equals("2"))) {
 
-					if (context.getGeneration().equals("2")
-						&& (isBasic || isEN16931 || isXRechnung)) {
-						//additionally validate against CEN
+					if (isXRechnung) {
+						//additionally validate against CEN, the CEN rules are part of the ZF Schematron anyway
 						validateSchematron(zfXML, "/xslt/en16931schematron/EN16931-CII-validation.xslt", 24, ESeverity.error);
+					}
+					if (isXRechnung || isBasic || isEN16931) {
+						//potentially (basic or EN) or definitely validate against XR
 						if (!disableNotices || XrechnungSeverity != ESeverity.notice) {
 							validateXR(zfXML, XrechnungSeverity);
 						}