diff --git a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultDataQueryService.java b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultDataQueryService.java
index 69e86cd94d35..cfd9e291a8ae 100644
--- a/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultDataQueryService.java
+++ b/dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultDataQueryService.java
@@ -395,7 +395,7 @@ private DimensionalObject getDimension(
       I18nFormat format,
       boolean allowNull,
       IdScheme inputIdScheme) {
-    final boolean allItems = items.isEmpty();
+    final boolean allItems = items.isEmpty() || items.contains("ALL_ITEMS");
     User user = currentUserService.getCurrentUser();
 
     if (DATA_X_DIM_ID.equals(dimension)) {