diff --git a/src/main/java/org/caosdb/server/entity/Entity.java b/src/main/java/org/caosdb/server/entity/Entity.java
index 76ed7bf1ed2a16dfbade6d6effb162e391ce1c84..2ae8ddc1961b197d44a1636ff327962dd583763b 100644
--- a/src/main/java/org/caosdb/server/entity/Entity.java
+++ b/src/main/java/org/caosdb/server/entity/Entity.java
@@ -700,7 +700,6 @@ public class Entity extends AbstractObservable implements EntityInterface {
     if (!this.isParsed) {
       this.isParsed = true;
       setValue(getDatatype().parseValue(getValue()));
-      this.isParsed = true;
     }
   }
 
diff --git a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
index 0b2d7917bf604960738cf305b93d4b50b18d52c8..b246af0c7715ef3f2a7798e2e629cb575e61128d 100644
--- a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
+++ b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java
@@ -70,6 +70,9 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa
       if (sub_request.getRetrieveRequest().hasQuery() // Retrieves are either queries...
           && !sub_request.getRetrieveRequest().getQuery().getQuery().isBlank()) {
         final String query = sub_request.getRetrieveRequest().getQuery().getQuery();
+        if (container.getFlags().containsKey("query")) { // Check for more than one query request.
+          throw new CaosDBException("Cannot process more than one query request.");
+        }
         container.getFlags().put("query", query);
         if (isFileDownload) {
           container.getFlags().put("download_files", "true");