diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd1214eb815..fa57a4925c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@
         ([#3460](https://github.com/Automattic/pocket-casts-android/pull/3460))
     *   Fix issue with playback stopping when using Pixel Buds actions.
         ([#3493](https://github.com/Automattic/pocket-casts-android/pull/3493))
+    *   Fix issue with sleep timer end of episode when has skip last set
+        ([#3582](https://github.com/Automattic/pocket-casts-android/pull/3582))
 *   Updates
     *   Remove audio and video clip sharing
         ([#3481](https://github.com/Automattic/pocket-casts-android/pull/3481))
diff --git a/modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/playback/PlaybackManager.kt b/modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/playback/PlaybackManager.kt
index 2bfff20672e..e0de967fe4d 100644
--- a/modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/playback/PlaybackManager.kt
+++ b/modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/playback/PlaybackManager.kt
@@ -1458,8 +1458,8 @@ open class PlaybackManager @Inject constructor(
             val podcast = playbackStateRelay.blockingFirst().podcast
             if (podcast != null && podcast.skipLastSecs > 0) {
                 pause(sourceView = SourceView.AUTO_PAUSE)
+                onPlayerPaused()
             }
-            onPlayerPaused()
 
             // jump back 5 seconds from the current time so when the player opens it doesn't complete before giving the user a chance to skip back
             player?.let {
@@ -2206,6 +2206,7 @@ open class PlaybackManager @Inject constructor(
             if (timeRemaining < skipLast) {
                 if (isSleepAfterEpisodeEnabled()) {
                     sleepEndOfEpisode(episode)
+                    episodeManager.markAsPlayedBlocking(episode, this, podcastManager)
                 } else {
                     statsManager.addTimeSavedAutoSkipping(timeRemaining.toLong() * 1000L)
                     episodeManager.markAsPlayedBlocking(episode, this, podcastManager)