diff --git a/android/src/main/java/com/tpstreams/TPStreamsRNPlayerView.kt b/android/src/main/java/com/tpstreams/TPStreamsRNPlayerView.kt
index d686d58..70ea767 100644
--- a/android/src/main/java/com/tpstreams/TPStreamsRNPlayerView.kt
+++ b/android/src/main/java/com/tpstreams/TPStreamsRNPlayerView.kt
@@ -42,6 +42,13 @@ class TPStreamsRNPlayerView(context: ThemedReactContext) : FrameLayout(context)
         addView(playerView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
     }
 
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        player?.let { p ->
+            playerView.player = p
+        }
+    }
+
     override fun requestLayout() {
         super.requestLayout()
         if (!isLayoutUpdatePosted) {
@@ -258,6 +265,7 @@ class TPStreamsRNPlayerView(context: ThemedReactContext) : FrameLayout(context)
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
+        playerView.player = null
         player?.pause()
     }