diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/SearchSetOrganization.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/SearchSetOrganization.java
index d67a02e28..2868a9148 100644
--- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/SearchSetOrganization.java
+++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/SearchSetOrganization.java
@@ -18,8 +18,7 @@ public SearchSetOrganization(int defaultPageCount)
 	protected Row toRow(ElementId id, Organization resource)
 	{
 		boolean active = resource.hasActiveElement() && resource.getActiveElement().hasValue()
-				? Boolean.TRUE.equals(resource.getActiveElement().getValue())
-				: false;
+				&& Boolean.TRUE.equals(resource.getActiveElement().getValue());
 
 		String identifier = getIdentifierValues(resource, Organization::hasIdentifier, Organization::getIdentifier,
 				NAMING_SYSTEM_ORGANIZATION_IDENTIFIER);
diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/SearchSetOrganizationAffiliation.java b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/SearchSetOrganizationAffiliation.java
index da9f5b108..14f8f3faa 100644
--- a/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/SearchSetOrganizationAffiliation.java
+++ b/dsf-fhir/dsf-fhir-server/src/main/java/dev/dsf/fhir/adapter/SearchSetOrganizationAffiliation.java
@@ -21,8 +21,7 @@ public SearchSetOrganizationAffiliation(int defaultPageCount)
 	protected Row toRow(ElementId id, OrganizationAffiliation resource)
 	{
 		boolean active = resource.hasActiveElement() && resource.getActiveElement().hasValue()
-				? Boolean.TRUE.equals(resource.getActiveElement().getValue())
-				: false;
+				&& Boolean.TRUE.equals(resource.getActiveElement().getValue());
 
 		ElementId parentOrganization = ElementId.from(resource, OrganizationAffiliation::hasOrganization,
 				OrganizationAffiliation::getOrganization);