diff --git a/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/PicsureRS.java b/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/PicsureRS.java
index 9cae650a..2e27fc3d 100644
--- a/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/PicsureRS.java
+++ b/pic-sure-api-war/src/main/java/edu/harvard/dbmi/avillach/PicsureRS.java
@@ -155,7 +155,7 @@ public QueryStatus query(
 
 		@Context SecurityContext context
 	) {
-		if (dataQueryRequest instanceof GeneralQueryRequest) {
+		if (isInstitutionQuery == null || !isInstitutionQuery) {
 			return queryService.query(dataQueryRequest, headers);
 		} else {
 			String email = context.getUserPrincipal().getName();