diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index ab70725f54..c53fde76c7 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -53,13 +53,17 @@
 
         }).on('playbackstop.mediacontroller', function (e, state) {
 
-            ApiClient.reportPlaybackStopped({
-
+            var stopInfo = {
                 itemId: state.NowPlayingItem.Id,
                 mediaSourceId: state.PlayState.MediaSourceId,
                 positionTicks: state.PlayState.PositionTicks
+            };
 
-            });
+            if (state.PlayState.LiveStreamId) {
+                stopInfo.LiveStreamId = state.PlayState.LiveStreamId;
+            }
+
+            ApiClient.reportPlaybackStopped(stopInfo);
 
         }).on('positionchange.mediacontroller', function (e, state) {
 
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 88c9e058c0..bd3979f191 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -1390,6 +1390,8 @@
                     state.PlayState.PlayMethod = getParameterByName('static', currentSrc) == 'true' ?
                         'DirectStream' :
                         'Transcode';
+
+                    state.PlayState.LiveStreamId = getParameterByName('LiveStreamId', currentSrc);
                 }
             }
 
@@ -1567,14 +1569,6 @@
 
             info = $.extend(info, state.PlayState);
 
-            if (element) {
-                var currentSrc = element.currentSrc;
-                var liveStreamId = getParameterByName('LiveStreamId', currentSrc);
-                if (liveStreamId) {
-                    info.LiveStreamId = liveStreamId;
-                }
-            }
-
             ApiClient.reportPlaybackProgress(info);
         }