diff --git a/libraries/ui_compose/src/main/java/androidx/media3/ui/compose/PlayerSurface.kt b/libraries/ui_compose/src/main/java/androidx/media3/ui/compose/PlayerSurface.kt
index f681d28025..e02309a697 100644
--- a/libraries/ui_compose/src/main/java/androidx/media3/ui/compose/PlayerSurface.kt
+++ b/libraries/ui_compose/src/main/java/androidx/media3/ui/compose/PlayerSurface.kt
@@ -51,11 +51,11 @@ fun PlayerSurface(player: Player, surfaceType: @SurfaceType Int, modifier: Modif
   val currentPlayer by rememberUpdatedState(player)
   val onSurfaceCreated: (Surface) -> Unit = { surface ->
     if (currentPlayer.isCommandAvailable(Player.COMMAND_SET_VIDEO_SURFACE))
-      player.setVideoSurface(surface)
+      currentPlayer.setVideoSurface(surface)
   }
   val onSurfaceDestroyed: () -> Unit = {
     if (currentPlayer.isCommandAvailable(Player.COMMAND_SET_VIDEO_SURFACE))
-      player.clearVideoSurface()
+      currentPlayer.clearVideoSurface()
   }
   val onSurfaceInitialized: AndroidExternalSurfaceScope.() -> Unit = {
     onSurface { surface, _, _ ->