diff --git a/Sora.xcodeproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate b/Sora.xcodeproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate
index a187c63..cd42c15 100644
Binary files a/Sora.xcodeproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate and b/Sora.xcodeproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Sora/Utils/CustomPlayer/CustomPlayer.swift b/Sora/Utils/CustomPlayer/CustomPlayer.swift
index ca40138..8748230 100644
--- a/Sora/Utils/CustomPlayer/CustomPlayer.swift
+++ b/Sora/Utils/CustomPlayer/CustomPlayer.swift
@@ -58,6 +58,12 @@ struct CustomMediaPlayer: View {
         self.title = title
         self.episodeNumber = episodeNumber
         self.onWatchNext = onWatchNext
+        
+        let lastPlayedTime = UserDefaults.standard.double(forKey: "lastPlayedTime_\(fullUrl)")
+        if lastPlayedTime > 0 {
+            let seekTime = CMTime(seconds: lastPlayedTime, preferredTimescale: 1)
+            self._player.wrappedValue.seek(to: seekTime)
+        }
     }
     
     var body: some View {
@@ -146,7 +152,7 @@ struct CustomMediaPlayer: View {
                                     .padding(.horizontal, 32)
                                 }
                                 Spacer()
-                                if duration - currentTime <= duration * 0.10 && currentTime != 0 {
+                                if duration - currentTime <= duration * 0.10 && currentTime != duration {
                                     Button(action: {
                                         player.pause()
                                         presentationMode.wrappedValue.dismiss()