diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
index 37fe62b..6b364d9 100644
--- a/mythtv/libs/libmythtv/mythplayer.cpp
+++ b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -2895,8 +2895,15 @@ void MythPlayer::EventLoop(void)
     // Handle end of file
     EofState _eof = GetEof();
     if ((_eof != kEofStateNone && !allpaused) ||
-        (!GetEditMode() && framesPlayed >= deleteMap.GetLastFrame()))
-    {
+        (!player_ctx->buffer->IsInStillFrame() && !GetEditMode() &&
+         deleteMap.GetLastFrame() &&
+         framesPlayed >= deleteMap.GetLastFrame()))
+    {
+        LOG(VB_GENERAL, LOG_NOTICE, LOC + QString("eof=%1, allpaused=%2, framesPlayed=%3, lastFrame=%4")
+            .arg(_eof)
+            .arg(allpaused)
+            .arg(framesPlayed)
+            .arg(deleteMap.GetLastFrame()));
 #ifdef USING_MHEG
         if (interactiveTV && interactiveTV->StreamStarted(false))
         {