diff --git a/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetSection/DataValueRepository.kt b/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetSection/DataValueRepository.kt
index 4023f3ee00..a3297b94d0 100644
--- a/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetSection/DataValueRepository.kt
+++ b/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/dataSetSection/DataValueRepository.kt
@@ -334,13 +334,12 @@ class DataValueRepository(
 
             val dataElements = d2.dataElementModule().dataElements()
                 .byUid().`in`(dataSetElementsInDataset?.map { it.dataElement().uid() })
-                .orderByDisplayName(RepositoryScope.OrderByDirection.ASC)
+                .orderByName(RepositoryScope.OrderByDirection.ASC)
                 .blockingGet()
 
             Flowable.just(
                 dataElements.map { transformDataElement(it, dataSetElementsInDataset) }
-                    .filter { it.categoryComboUid() == categoryCombo.uid() }
-                    .sortedBy { it.displayFormName()?.lowercase() },
+                    .filter { it.categoryComboUid() == categoryCombo.uid() },
             )
         }
     }