--- /mythtv/libs/libmythtv/tv_play.cpp	2016-04-23 17:11:06.191769536 -0700
+++ /mythtv/libs/libmythtv/tv_play.cpp	2016-04-23 17:09:56.501766985 -0700
@@ -7870,8 +7870,7 @@
     if (ctx->prevChan.empty())
         ctx->PushPreviousChannel();
 
-    if (ctx->player)
-        ctx->player->GetAudio()->Pause(true);
+    PauseAudioUntilBuffered(ctx);
     PauseLiveTV(ctx);
 
     ctx->LockDeletePlayer(__FILE__, __LINE__);
@@ -7888,8 +7887,7 @@
         ctx->player->GetAudio()->Reset();
 
     UnpauseLiveTV(ctx, chanid && GetQueuedChanID());
-    PauseAudioUntilBuffered(ctx);
-
+    
     if (oldinputname != ctx->recorder->GetInput())
         UpdateOSDInput(ctx);
 }