diff --git a/src/main/java/org/cbioportal/web/ResourceDataController.java b/src/main/java/org/cbioportal/web/ResourceDataController.java
index 8f92598afb2..4920791285a 100644
--- a/src/main/java/org/cbioportal/web/ResourceDataController.java
+++ b/src/main/java/org/cbioportal/web/ResourceDataController.java
@@ -207,8 +207,8 @@ public ResponseEntity<List<ResourceData>> getAllStudyResourceDataInStudyPatientS
     }
 
     @Cacheable(
-        cacheResolver = "staticRepositoryCacheOneResolver"
-        //condition = "@cacheEnabledConfig.getEnabled() && #unfilteredQuery && (#sortBy == null || #sortBy.isEmpty())"
+        cacheResolver = "staticRepositoryCacheOneResolver",
+        condition = "@cacheEnabledConfig.getEnabled()"
     )
     public List<ResourceData> cacheableFetchAllResourceDataForStudyPatientSample(String studyId, String resourceId, String projectionName, 
         Integer pageSize, Integer pageNumber, String sortBy, String directionName) throws StudyNotFoundException {