diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackControls.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackControls.kt
index f7afb526..3bbf54ba 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackControls.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackControls.kt
@@ -274,7 +274,7 @@ fun SeekBar(
             modifier = Modifier.fillMaxWidth(),
             interactionSource = interactionSource,
             enabled = isEnabled,
-            durationMs = player.contentDuration,
+            durationMs = player.duration,
             seekBack = seekBack,
             seekForward = seekForward,
         )
diff --git a/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MPVProperty.kt b/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MPVProperty.kt
index d279eaaf..923a862f 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MPVProperty.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MPVProperty.kt
@@ -21,6 +21,7 @@ object MPVProperty {
     const val HWDEC = "hwdec-current"
     const val MUTE = "mute"
     const val TRACK_AUDIO = "current-tracks/audio/selected"
+    const val SEEKABLE = "seekable"
 
     val observedProperties =
         mapOf(
@@ -38,5 +39,6 @@ object MPVProperty {
             HWDEC to MPV_FORMAT_NONE,
             MUTE to MPV_FORMAT_FLAG,
             TRACK_AUDIO to MPV_FORMAT_NONE,
+            SEEKABLE to MPV_FORMAT_FLAG,
         )
 }
diff --git a/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt b/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt
index 53a8343a..94cbece3 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt
@@ -25,6 +25,7 @@ import androidx.media3.common.text.CueGroup
 import androidx.media3.common.util.Size
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.common.util.Util
+import com.github.damontecres.wholphin.util.mpv.MPVLib.MpvEvent.MPV_EVENT_FILE_LOADED
 import timber.log.Timber
 import kotlin.concurrent.atomics.ExperimentalAtomicApi
 import kotlin.time.Duration.Companion.seconds
@@ -48,6 +49,7 @@ class MpvPlayer(
 
     private var mediaItem: MediaItem? = null
 
+    private var startPositionMs: Long = 0L
     private var durationMs: Long = 0L
     private var positionMs: Long = 0L
 
@@ -135,7 +137,7 @@ class MpvPlayer(
     ) {
         if (DEBUG) Timber.v("setMediaItems")
         setMediaItems(mediaItems.subList(startIndex, mediaItems.size), false)
-        seekTo(startPositionMs)
+        this.startPositionMs = startPositionMs
     }
 
     override fun addMediaItems(
@@ -164,6 +166,8 @@ class MpvPlayer(
 
     override fun prepare() {
         if (DEBUG) Timber.v("prepare")
+        durationMs = 0L
+        positionMs = 0L
     }
 
     override fun getPlaybackState(): Int {
@@ -235,6 +239,7 @@ class MpvPlayer(
     override fun release() {
         Timber.i("release")
         if (!isReleased) {
+            MPVLib.removeObserver(this)
             clearVideoSurfaceView(null)
             MPVLib.destroy()
         }
@@ -519,6 +524,14 @@ class MpvPlayer(
 
     override fun event(eventId: Int) {
         Timber.v("event: $eventId")
+        when (eventId) {
+            MPV_EVENT_FILE_LOADED -> {
+                Timber.d("Seeking to $startPositionMs")
+                if (startPositionMs > 0) {
+                    seekTo(startPositionMs)
+                }
+            }
+        }
     }
 
     private fun throwIfReleased() {