diff --git a/app/src/main/java/com/bitchat/android/ui/LocationNotesButton.kt b/app/src/main/java/com/bitchat/android/ui/LocationNotesButton.kt
index 9f7faef7..09084a92 100644
--- a/app/src/main/java/com/bitchat/android/ui/LocationNotesButton.kt
+++ b/app/src/main/java/com/bitchat/android/ui/LocationNotesButton.kt
@@ -51,7 +51,7 @@ fun LocationNotesButton(
 
     // Only show in mesh mode when location is authorized (iOS pattern)
     if (selectedLocationChannel is ChannelID.Mesh && locationEnabled) {
-        val hasNotes = (notesCount ?: 0) > 0
+        val hasNotes = notesCount > 0
         IconButton(
             onClick = onClick,
             modifier = modifier.size(24.dp)
diff --git a/app/src/main/java/com/bitchat/android/ui/LocationNotesSheetPresenter.kt b/app/src/main/java/com/bitchat/android/ui/LocationNotesSheetPresenter.kt
index 25af0a83..9d4da4c9 100644
--- a/app/src/main/java/com/bitchat/android/ui/LocationNotesSheetPresenter.kt
+++ b/app/src/main/java/com/bitchat/android/ui/LocationNotesSheetPresenter.kt
@@ -62,8 +62,10 @@ private fun LocationNotesErrorSheet(
     onDismiss: () -> Unit,
     locationManager: LocationChannelManager
 ) {
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
     ModalBottomSheet(
         onDismissRequest = onDismiss,
+        sheetState = sheetState,
         containerColor = MaterialTheme.colorScheme.surface
     ) {
         Column(