diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57efbf32d..62374c693 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).
 
+## [3.2.1] - 23-12-07
+
+### Fixed
+
+- Fixed an issue on Android where `EnterCue` and `ExitCue` text track events did not contain the `trackUid` property.
+
 ## [3.2.0] - 23-11-29
 
 ### Fixed
diff --git a/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt b/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt
index 7db489115..b0618e1d3 100644
--- a/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt
+++ b/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt
@@ -437,14 +437,14 @@ class PlayerEventEmitter internal constructor(
   }
 
   private val onTextTrackEnterCue = EventListener<EnterCueEvent> { event ->
-    val payload = PayloadBuilder().textTrackCue(event.cue, null /*TODO*/).build().apply {
+    val payload = PayloadBuilder().textTrackCue(event.cue, event.track).build().apply {
       putInt(EVENT_PROP_TYPE, TextTrackCueEventType.ENTER_CUE.type)
     }
     receiveEvent(EVENT_TEXTTRACK_EVENT, payload)
   }
 
   private val onTextTrackExitCue = EventListener<ExitCueEvent> { event ->
-    val payload = PayloadBuilder().textTrackCue(event.cue, null /*TODO*/).build().apply {
+    val payload = PayloadBuilder().textTrackCue(event.cue, event.track).build().apply {
       putInt(EVENT_PROP_TYPE, TextTrackCueEventType.EXIT_CUE.type)
     }
     receiveEvent(EVENT_TEXTTRACK_EVENT, payload)
diff --git a/android/src/main/java/com/theoplayer/util/ViewResolver.kt b/android/src/main/java/com/theoplayer/util/ViewResolver.kt
index 3626d3eb7..14583afcc 100644
--- a/android/src/main/java/com/theoplayer/util/ViewResolver.kt
+++ b/android/src/main/java/com/theoplayer/util/ViewResolver.kt
@@ -22,9 +22,9 @@ class ViewResolver(private val reactContext: ReactApplicationContext) {
     uiManager?.addUIBlock {
       try {
         onResolved(it.resolveView(tag) as ReactTHEOplayerView)
-      } catch (ignore: Exception) {
+      } catch (e: Exception) {
         // The ReactTHEOplayerView instance could not be resolved: log but do not forward exception.
-        Log.w(TAG, "Failed to resolve ReactTHEOplayerView tag $tag")
+        Log.e(TAG, "Failed to resolve ReactTHEOplayerView tag $tag: $e")
         onResolved(null)
       }
     }
diff --git a/package-lock.json b/package-lock.json
index 3f15d5f91..2948391e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "react-native-theoplayer",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "react-native-theoplayer",
-      "version": "3.2.0",
+      "version": "3.2.1",
       "license": "SEE LICENSE AT https://www.theoplayer.com/terms",
       "dependencies": {
         "buffer": "^6.0.3"
diff --git a/package.json b/package.json
index f067d1225..8d5413fdc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",