diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/StreamCityGmlConsumer.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/StreamCityGmlConsumer.java
index 2ebf44dfe45bbb947316a1c2b0465b145680d13b..f555a8ea6d0f24519033c40bfb69b3e038da4b6e 100644
--- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/StreamCityGmlConsumer.java
+++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/StreamCityGmlConsumer.java
@@ -29,6 +29,9 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import de.hft.stuttgart.citydoctor2.datastructure.AbstractTunnel;
+import de.hft.stuttgart.citydoctor2.datastructure.CityFurniture;
+import de.hft.stuttgart.citydoctor2.datastructure.GenericCityObject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.citygml4j.core.model.core.AbstractFeatureProperty;
@@ -139,8 +142,12 @@ public class StreamCityGmlConsumer implements CityGmlConsumer {
 			pdfReporter.report(co);
 		}
 
-		// store quality ade datastructures in cityobject
-		QualityADEUtils.writeQualityAde(co, val);
+		// TODO: Update QualityADE to be compatible with CityGML 3.0 or deprecate it, unhandled top-level feature types are just skipped for now
+		if (!(co instanceof AbstractTunnel || co instanceof CityFurniture || co instanceof GenericCityObject)) {
+			// store quality ade datastructures in cityobject
+			QualityADEUtils.writeQualityAde(co, val);
+		}
+
 		// recreate geometry
 		co.reCreateGeometries(gmlFactory, config.getParserConfiguration());