diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitsList.kt b/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitsList.kt
index 920d576b..53773e1d 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitsList.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitsList.kt
@@ -43,19 +43,19 @@ fun UnitsList(
             if (groupedUnits.isEmpty()) {
                 item { SearchPlaceholder() }
             } else {
-                groupedUnits.forEach { (groupOfMeasurements, listOfMeasurements) ->
+                groupedUnits.forEach { (unitGroup, listOfUnits) ->
                     stickyHeader {
                         Text(
                             modifier = Modifier
                                 .background(MaterialTheme.colorScheme.background)
                                 .fillMaxWidth()
                                 .padding(vertical = 12.dp, horizontal = 8.dp),
-                            text = stringResource(id = groupOfMeasurements.res),
+                            text = stringResource(id = unitGroup.res),
                             style = MaterialTheme.typography.titleMedium,
                             color = MaterialTheme.colorScheme.primary
                         )
                     }
-                    items(listOfMeasurements) { unit ->
+                    items(items = listOfUnits, key = { it.unitId }) { unit ->
                         UnitListItem(
                             modifier = Modifier,
                             changeAction = changeAction,