diff --git a/multipicker/build.gradle b/multipicker/build.gradle
index 950e76020f..d8cfeee3c9 100644
--- a/multipicker/build.gradle
+++ b/multipicker/build.gradle
@@ -20,7 +20,6 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.3"
 
     defaultConfig {
         minSdkVersion 19
diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/Picker.kt b/multipicker/src/main/java/im/vector/riotx/multipicker/Picker.kt
index e05dd50d40..43ac5d5fdd 100644
--- a/multipicker/src/main/java/im/vector/riotx/multipicker/Picker.kt
+++ b/multipicker/src/main/java/im/vector/riotx/multipicker/Picker.kt
@@ -103,10 +103,11 @@ abstract class Picker<T>(open val requestCode: Int) {
             selectedUriList.add(dataUri)
         } else {
             data?.extras?.get(Intent.EXTRA_STREAM)?.let {
-                @Suppress("UNCHECKED_CAST")
-                when (it) {
-                    is List<*> -> selectedUriList.addAll(it as List<Uri>)
-                    else     -> selectedUriList.add(it as Uri)
+                (it as? List<*>)?.filterIsInstance<Uri>()?.let { uriList ->
+                    selectedUriList.addAll(uriList)
+                }
+                if (it is Uri) {
+                    selectedUriList.add(it)
                 }
             }
         }