diff --git a/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java b/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
index c49613b..878a547 100644
--- a/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
+++ b/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
@@ -674,6 +674,9 @@ public class AudioPlayer implements MethodCallHandler, Player.EventListener, Met
 			player = null;
 			transition(ProcessingState.none);
 		}
+		if (eventSink != null) {
+			eventSink.endOfStream();
+		}
 		onDispose.run();
 	}
 
diff --git a/lib/just_audio.dart b/lib/just_audio.dart
index 14e8918..15f1b6f 100644
--- a/lib/just_audio.dart
+++ b/lib/just_audio.dart
@@ -567,14 +567,11 @@ class AudioPlayer {
     _proxy?.stop();
     await _durationSubject.close();
     await _eventChannelStreamSubscription.cancel();
-    await _playbackEventSubject.close();
     await _loopModeSubject.close();
     await _shuffleModeEnabledSubject.close();
     await _playingSubject.close();
     await _volumeSubject.close();
     await _speedSubject.close();
-    await _playerStateSubject.drain();
-    await _playerStateSubject.close();
     if (_positionSubject != null) {
       await _positionSubject.close();
     }