diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0998cc081..9a9649a88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 ### Added
-- support Android Marshmallow (API 23)
+- support Android Lollipop & Marshmallow (API 21 ~ 23)
 
 ## [v1.3.4] - 2021-02-10
 ### Added
diff --git a/README.md b/README.md
index 8eb19d9d7..ef2b6cdf3 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Aves is a gallery and metadata explorer app. It is built for Android, with Flutt
 - search and filter by country, place, XMP tag, type (animated, raster, vector…)
 - favorites
 - statistics
-- support Android API 23 ~ 30 (Marshmallow ~ R)
+- support Android API 21 ~ 30 (Lollipop ~ R)
 - Android integration (app shortcuts, handle view/pick intents)
 
 ## Known Issues
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7da22a93d..33987090d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -53,7 +53,7 @@ android {
 
     defaultConfig {
         applicationId "deckers.thibault.aves"
-        minSdkVersion 23
+        minSdkVersion 21
         targetSdkVersion 30 // same as compileSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MediaMetadataRetrieverHelper.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MediaMetadataRetrieverHelper.kt
index 6852bedda..680afb1ec 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MediaMetadataRetrieverHelper.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MediaMetadataRetrieverHelper.kt
@@ -15,7 +15,6 @@ object MediaMetadataRetrieverHelper {
         MediaMetadataRetriever.METADATA_KEY_ARTIST to "Artist",
         MediaMetadataRetriever.METADATA_KEY_AUTHOR to "Author",
         MediaMetadataRetriever.METADATA_KEY_BITRATE to "Bitrate",
-        MediaMetadataRetriever.METADATA_KEY_CAPTURE_FRAMERATE to "Capture Framerate",
         MediaMetadataRetriever.METADATA_KEY_CD_TRACK_NUMBER to "CD Track Number",
         MediaMetadataRetriever.METADATA_KEY_COMPILATION to "Compilation",
         MediaMetadataRetriever.METADATA_KEY_COMPOSER to "Composer",
@@ -35,6 +34,9 @@ object MediaMetadataRetrieverHelper {
         MediaMetadataRetriever.METADATA_KEY_WRITER to "Writer",
         MediaMetadataRetriever.METADATA_KEY_YEAR to "Year",
     ).apply {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            put(MediaMetadataRetriever.METADATA_KEY_CAPTURE_FRAMERATE, "Capture Framerate")
+        }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             putAll(
                 hashMapOf(
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MetadataExtractorHelper.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MetadataExtractorHelper.kt
index fe05a46b3..33de19899 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MetadataExtractorHelper.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MetadataExtractorHelper.kt
@@ -12,10 +12,6 @@ object MetadataExtractorHelper {
 
     // extensions
 
-    fun Directory.getSafeDescription(tag: Int, save: (value: String) -> Unit) {
-        if (this.containsTag(tag)) save(this.getDescription(tag))
-    }
-
     fun Directory.getSafeString(tag: Int, save: (value: String) -> Unit) {
         if (this.containsTag(tag)) save(this.getString(tag))
     }