diff --git a/apps/flipcash/shared/chat-ui/src/main/kotlin/com/flipcash/shared/chat/ui/media/ChatPhotoPicker.kt b/apps/flipcash/shared/chat-ui/src/main/kotlin/com/flipcash/shared/chat/ui/media/ChatPhotoPicker.kt
index ab8a45e73..09878fe09 100644
--- a/apps/flipcash/shared/chat-ui/src/main/kotlin/com/flipcash/shared/chat/ui/media/ChatPhotoPicker.kt
+++ b/apps/flipcash/shared/chat-ui/src/main/kotlin/com/flipcash/shared/chat/ui/media/ChatPhotoPicker.kt
@@ -1,6 +1,8 @@
 package com.flipcash.shared.chat.ui.media
 
 import android.net.Uri
+import android.os.Build
+import android.os.ext.SdkExtensions
 import android.provider.MediaStore
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.PickVisualMediaRequest
@@ -30,7 +32,19 @@ fun rememberChatPhotoPicker(
     val single = rememberLauncherForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
         if (uri != null) currentOnPicked(listOf(uri))
     }
-    val max = remaining.coerceIn(2, maxOf(2, MediaStore.getPickImagesMaxLimit()))
+    // getPickImagesMaxLimit() only exists where the system picker does (API 33+, or SDK
+    // extension R 2+). Without it, the open slots are the only cap.
+    val systemMax = remember {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU ||
+            (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
+                SdkExtensions.getExtensionVersion(Build.VERSION_CODES.R) >= 2)
+        ) {
+            MediaStore.getPickImagesMaxLimit()
+        } else {
+            null
+        }
+    }
+    val max = maxOf(2, systemMax?.let { minOf(remaining, it) } ?: remaining)
     val multiple = rememberLauncherForActivityResult(
         ActivityResultContracts.PickMultipleVisualMedia(max),
     ) { uris ->