diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java
index fdb2daaeae..402fca62f1 100644
--- a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java
+++ b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java
@@ -1107,12 +1107,12 @@ public void stop() {
         stopReportLoop();
         if (mPlaybackState != PlaybackState.IDLE && mPlaybackState != PlaybackState.UNDEFINED) {
             mPlaybackState = PlaybackState.IDLE;
-        }
 
-        if (mVideoManager != null && mVideoManager.isPlaying()) mVideoManager.stopPlayback();
-        Long mbPos = mCurrentPosition * 10000;
-        ReportingHelper.reportStopped(getCurrentlyPlayingItem(), getCurrentStreamInfo(), mbPos);
-        clearPlaybackSessionOptions();
+            if (mVideoManager != null && mVideoManager.isPlaying()) mVideoManager.stopPlayback();
+            Long mbPos = mCurrentPosition * 10000;
+            ReportingHelper.reportStopped(getCurrentlyPlayingItem(), getCurrentStreamInfo(), mbPos);
+            clearPlaybackSessionOptions();
+        }
     }
 
     public void refreshStream() {
diff --git a/app/src/main/java/org/jellyfin/androidtv/util/apiclient/ReportingHelper.java b/app/src/main/java/org/jellyfin/androidtv/util/apiclient/ReportingHelper.java
index ee8ab64668..c732179b26 100644
--- a/app/src/main/java/org/jellyfin/androidtv/util/apiclient/ReportingHelper.java
+++ b/app/src/main/java/org/jellyfin/androidtv/util/apiclient/ReportingHelper.java
@@ -19,6 +19,7 @@
 public class ReportingHelper {
     public static void reportStopped(org.jellyfin.sdk.model.api.BaseItemDto item, StreamInfo streamInfo, long pos) {
         if (item != null && streamInfo != null) {
+            Timber.i("ReportingHelper.reportStopped called for " + item.getId() + " at position " + pos);
             PlaybackStopInfo info = new PlaybackStopInfo();
             info.setItemId(item.getId().toString());
             info.setPositionTicks(pos);