diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala
index b3380210c7..4823347d9c 100644
--- a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala
+++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala
@@ -3581,9 +3581,8 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon
             }
 
         // Update the ontology cache using the new class definition.
-        newReadClassInfo: ReadClassInfoV2 = ReadClassInfoV2(
-                                              entityInfoContent = loadedClassDef,
-                                              allBaseClasses = classToUpdate.allBaseClasses
+        newReadClassInfo: ReadClassInfoV2 = classToUpdate.copy(
+                                              entityInfoContent = classDefWithoutComment
                                             )
 
         updatedOntologyMetadata: OntologyMetadataV2 = ontology.ontologyMetadata.copy(
diff --git a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt
index 35e1c25a60..8204e988ae 100644
--- a/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt
+++ b/webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt
@@ -60,6 +60,8 @@ WHERE {
         ?ontology rdf:type owl:Ontology ;
             knora-base:lastModificationDate "@lastModificationDate"^^xsd:dateTime .
 
+        ?class ?p ?o .
+
         OPTIONAL {
             ?class <@predicateToUpdate> ?oldObj .
         }