diff --git a/src/third_party/starboard/rdk/shared/player/player_internal.cc b/src/third_party/starboard/rdk/shared/player/player_internal.cc
index 49cbbe6..d3aeab1 100644
--- a/src/third_party/starboard/rdk/shared/player/player_internal.cc
+++ b/src/third_party/starboard/rdk/shared/player/player_internal.cc
@@ -2027,7 +2027,6 @@
       eos_data_ |= static_cast<int>(MediaType::kAudio);
 
   gst_app_src_end_of_stream(GST_APP_SRC(src));
-  RecordTimestamp(stream_type, kSbTimeMax);
 }
 
 bool PlayerImpl::WriteSample(SbMediaType sample_type, GstBuffer* buffer, uint64_t serial_id) {
@@ -2665,7 +2664,8 @@
 
   if (min_ts + kMarginNs <= position &&
       GST_STATE(pipeline_) == GST_STATE_PLAYING &&
-      GST_STATE_PENDING(pipeline_) != GST_STATE_PAUSED) {
+      GST_STATE_PENDING(pipeline_) != GST_STATE_PAUSED &&
+      eos_data_ == 0) {
     {
       ::starboard::ScopedLock lock(mutex_);
       DecoderNeedsData(lock, origin);