diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80cc50302..1b102c932 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+- Fixed an issue on Android where compilation would fail when depending on player SDK 6.2.0.
+
 ## [3.0.1] - 23-10-12
 
 ### Fixed
diff --git a/android/src/main/java/com/theoplayer/track/QualityListAdapter.kt b/android/src/main/java/com/theoplayer/track/QualityListAdapter.kt
index 50ec99f33..96d1e58dd 100644
--- a/android/src/main/java/com/theoplayer/track/QualityListAdapter.kt
+++ b/android/src/main/java/com/theoplayer/track/QualityListAdapter.kt
@@ -33,8 +33,8 @@ class QualityListAdapter<Q : Quality> : QualityList<Q> {
     return qualities.size
   }
 
-  override fun getItem(i: Int): Q? {
-    return if (i >= 0 && i < length()) qualities[i] else null
+  override fun getItem(i: Int): Q {
+    return qualities[i]
   }
 
   override fun iterator(): MutableIterator<Q?> {