diff --git a/Jetchat/app/src/main/java/com/example/compose/jetchat/components/BaseLineHeightModifier.kt b/Jetchat/app/src/main/java/com/example/compose/jetchat/components/BaseLineHeightModifier.kt
index d3b5596d2c..595e9672fa 100644
--- a/Jetchat/app/src/main/java/com/example/compose/jetchat/components/BaseLineHeightModifier.kt
+++ b/Jetchat/app/src/main/java/com/example/compose/jetchat/components/BaseLineHeightModifier.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.layout.Measurable
 import androidx.compose.ui.layout.MeasureResult
 import androidx.compose.ui.layout.MeasureScope
 import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.TextUnit
 
 /**
  * Applied to a Text, it sets the distance between the top and the first baseline. It
@@ -39,7 +39,7 @@ import androidx.compose.ui.unit.Dp
  * This modifier can be used to distribute multiple text elements using a certain distance between
  * baselines.
  */
-data class BaselineHeightModifier(val heightFromBaseline: Dp) : LayoutModifier {
+data class BaselineHeightModifier(val heightFromBaseline: TextUnit) : LayoutModifier {
 
     override fun MeasureScope.measure(measurable: Measurable, constraints: Constraints): MeasureResult {
 
@@ -55,4 +55,4 @@ data class BaselineHeightModifier(val heightFromBaseline: Dp) : LayoutModifier {
     }
 }
 
-fun Modifier.baselineHeight(heightFromBaseline: Dp): Modifier = this.then(BaselineHeightModifier(heightFromBaseline))
+fun Modifier.baselineHeight(heightFromBaseline: TextUnit): Modifier = this.then(BaselineHeightModifier(heightFromBaseline))
diff --git a/Jetchat/app/src/main/java/com/example/compose/jetchat/components/JetchatDrawer.kt b/Jetchat/app/src/main/java/com/example/compose/jetchat/components/JetchatDrawer.kt
index 6801dfcc16..e17cb33d90 100644
--- a/Jetchat/app/src/main/java/com/example/compose/jetchat/components/JetchatDrawer.kt
+++ b/Jetchat/app/src/main/java/com/example/compose/jetchat/components/JetchatDrawer.kt
@@ -138,7 +138,7 @@ private fun ChatItem(text: String, selected: Boolean, onChatClicked: () -> Unit)
     }
     Row(
         modifier = Modifier
-            .height(56.dp)
+            .heightIn(min = 56.dp)
             .fillMaxWidth()
             .padding(horizontal = 12.dp)
             .clip(CircleShape)
@@ -179,7 +179,7 @@ private fun ProfileItem(text: String, @DrawableRes profilePic: Int?, selected: B
     }
     Row(
         modifier = Modifier
-            .height(56.dp)
+            .heightIn(min = 56.dp)
             .fillMaxWidth()
             .padding(horizontal = 12.dp)
             .clip(CircleShape)
@@ -247,7 +247,7 @@ private fun WidgetDiscoverability() {
     val context = LocalContext.current
     Row(
         modifier = Modifier
-            .height(56.dp)
+            .heightIn(min = 56.dp)
             .fillMaxWidth()
             .padding(horizontal = 12.dp)
             .clip(CircleShape)
diff --git a/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/Conversation.kt b/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/Conversation.kt
index 6468fca68e..eee0ffa1f2 100644
--- a/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/Conversation.kt
+++ b/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/Conversation.kt
@@ -54,6 +54,7 @@ import androidx.compose.foundation.layout.exclude
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBars
@@ -675,7 +676,7 @@ fun DayHeader(dayString: String) {
     Row(
         modifier = Modifier
             .padding(vertical = 12.dp, horizontal = 16.dp)
-            .height(24.dp),
+            .heightIn(min = 24.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         DayHeaderLine()
diff --git a/Jetchat/app/src/main/java/com/example/compose/jetchat/profile/Profile.kt b/Jetchat/app/src/main/java/com/example/compose/jetchat/profile/Profile.kt
index 853de85ab4..712f0b92f0 100644
--- a/Jetchat/app/src/main/java/com/example/compose/jetchat/profile/Profile.kt
+++ b/Jetchat/app/src/main/java/com/example/compose/jetchat/profile/Profile.kt
@@ -53,6 +53,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.example.compose.jetchat.FunctionalityNotAvailablePopup
 import com.example.compose.jetchat.R
 import com.example.compose.jetchat.components.AnimatingFabContent
@@ -112,13 +113,13 @@ private fun NameAndPosition(userData: ProfileScreenState) {
     Column(modifier = Modifier.padding(horizontal = 16.dp)) {
         Name(
             userData,
-            modifier = Modifier.baselineHeight(32.dp),
+            modifier = Modifier.baselineHeight(32.sp),
         )
         Position(
             userData,
             modifier = Modifier
                 .padding(bottom = 20.dp)
-                .baselineHeight(24.dp),
+                .baselineHeight(24.sp),
         )
     }
 }
@@ -171,7 +172,7 @@ fun ProfileProperty(label: String, value: String, isLink: Boolean = false) {
         HorizontalDivider()
         Text(
             text = label,
-            modifier = Modifier.baselineHeight(24.dp),
+            modifier = Modifier.baselineHeight(24.sp),
             style = MaterialTheme.typography.bodySmall,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
         )
@@ -182,7 +183,7 @@ fun ProfileProperty(label: String, value: String, isLink: Boolean = false) {
         }
         Text(
             text = value,
-            modifier = Modifier.baselineHeight(24.dp),
+            modifier = Modifier.baselineHeight(24.sp),
             style = style,
         )
     }