diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
index fdd8c1fafa4c2b12e35510c15a7605fc61ab489e..1817a7b878281e1522c7e3738c92f457e2ce93aa 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
@@ -56,8 +56,10 @@ public class SetDeliverer {
 			if(hit.getFields().get(formatField) != null && hit.getFields().get(formatField).value().equals(formatToFilter)) {
 
 				this.identifier.add(hit.getFields().get(identifierField).values().get(0).toString());
-				this.project.add(hit.getFields().get("project.value").values().get(0).toString());
-				this.projectID.add(hit.getFields().get("project.id").values().get(0).toString());
+				if(textgrid==true){
+					this.project.add(hit.getFields().get("project.value").values().get(0).toString());
+					this.projectID.add(hit.getFields().get("project.id").values().get(0).toString());
+				}
 			}