diff --git a/android_app/app/src/main/java/com/health/openscale/ui/screen/components/LineChart.kt b/android_app/app/src/main/java/com/health/openscale/ui/screen/components/LineChart.kt
index 88e44313..d8974098 100644
--- a/android_app/app/src/main/java/com/health/openscale/ui/screen/components/LineChart.kt
+++ b/android_app/app/src/main/java/com/health/openscale/ui/screen/components/LineChart.kt
@@ -153,8 +153,14 @@ fun LineChart(
         if (targetMeasurementTypeId != null) {
             setOf(targetMeasurementTypeId.toString()) // If a specific type is targeted, that's the default.
         } else {
-            // Default selection for the general line chart (uses String IDs for settings).
-            setOf(MeasurementTypeKey.WEIGHT.id.toString(), MeasurementTypeKey.BODY_FAT.id.toString())
+            setOf(
+                MeasurementTypeKey.WEIGHT.id.toString(),
+                MeasurementTypeKey.BMI.id.toString(),
+                MeasurementTypeKey.BODY_FAT.id.toString(),
+                MeasurementTypeKey.WATER.id.toString(),
+                MeasurementTypeKey.MUSCLE.id.toString(),
+                MeasurementTypeKey.COMMENT.id.toString()
+            )
         }
     }
     val currentSelectedTypeIdsStrings by rememberContextualSelectedTypeIds(
diff --git a/android_app/app/src/main/java/com/health/openscale/ui/screen/table/TableScreen.kt b/android_app/app/src/main/java/com/health/openscale/ui/screen/table/TableScreen.kt
index e0c5ba4e..8c838332 100644
--- a/android_app/app/src/main/java/com/health/openscale/ui/screen/table/TableScreen.kt
+++ b/android_app/app/src/main/java/com/health/openscale/ui/screen/table/TableScreen.kt
@@ -63,6 +63,7 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.health.openscale.R
 import com.health.openscale.core.data.InputFieldType
+import com.health.openscale.core.data.MeasurementTypeKey
 import com.health.openscale.core.data.Trend
 import com.health.openscale.ui.navigation.Routes
 import com.health.openscale.ui.screen.SharedViewModel
@@ -230,9 +231,19 @@ fun TableScreen(
                 allTypes.filter { it.isEnabled }
             },
             // Logic to determine which types are selected by default.
-            // Example: enabled types that are also marked as default for table view.
             defaultSelectionLogic = { availableFilteredTypes ->
-                availableFilteredTypes.filter { it.isEnabled }.map { it.id }
+                val defaultDesiredTypeIds = listOf(
+                    MeasurementTypeKey.WEIGHT.id,
+                    MeasurementTypeKey.BMI.id,
+                    MeasurementTypeKey.BODY_FAT.id,
+                    MeasurementTypeKey.WATER.id,
+                    MeasurementTypeKey.MUSCLE.id,
+                    MeasurementTypeKey.COMMENT.id
+                )
+
+                availableFilteredTypes
+                    .filter { type -> type.id in defaultDesiredTypeIds && type.isEnabled }
+                    .map { it.id }
             },
             onSelectionChanged = { newSelectedIds ->
                 selectedColumnIdsFromFilter.clear()