diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index bf98650afd9c3935e8dfdefcdc62fe7a4a22d828..0a0af9c108a2efd8466957d9cbc2901fe16eaa4d 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -951,7 +951,7 @@ void LLViewerMedia::setAllMediaPaused(bool val)
                     pimpl->play();
                 }
             }
-            else if (pimpl->isMediaTimeBased() && pimpl->mMediaSource)
+            else if (pimpl->isMediaTimeBased() && pimpl->mMediaSource && (pimpl->isMediaPlaying() || pimpl->isMediaPaused()))
             {
                 pimpl->pause();
             }