diff --git a/client/src/components/LiveVoiceCapture.tsx b/client/src/components/LiveVoiceCapture.tsx
index ff75c10..513d636 100644
--- a/client/src/components/LiveVoiceCapture.tsx
+++ b/client/src/components/LiveVoiceCapture.tsx
@@ -44,6 +44,29 @@ export default function LiveVoiceCapture({
   const [previewDurationSec, setPreviewDurationSec] = useState(0)
   const [saving, setSaving] = useState(false)
 
+  const previewAudioRef = useRef<HTMLAudioElement | null>(null)
+
+  useEffect(() => {
+    const el = previewAudioRef.current
+    if (!el) return
+
+    const handleLoadedMetadata = () => {
+      if (el.duration === Infinity || isNaN(el.duration) || el.duration === 0) {
+        el.currentTime = 1e10
+        const onTimeUpdate = () => {
+          el.currentTime = 0
+          el.removeEventListener('timeupdate', onTimeUpdate)
+        }
+        el.addEventListener('timeupdate', onTimeUpdate)
+      }
+    }
+
+    el.addEventListener('loadedmetadata', handleLoadedMetadata)
+    return () => {
+      el.removeEventListener('loadedmetadata', handleLoadedMetadata)
+    }
+  }, [previewUrl])
+
   const stopStream = useCallback(() => {
     for (const track of streamRef.current?.getTracks() ?? []) {
       track.stop()
@@ -241,7 +264,7 @@ export default function LiveVoiceCapture({
 
         {phase === 'preview' && previewUrl && (
           <>
-            <audio className="voice-memo-player" controls src={previewUrl} preload="auto" />
+            <audio ref={previewAudioRef} className="voice-memo-player" controls src={previewUrl} preload="auto" />
             {onCaptionChange && (
               <label className="live-voice-caption-field">
                 <span>{t('logs.live_voice_caption_label')}</span>
diff --git a/client/src/components/VoiceMemoPlayer.tsx b/client/src/components/VoiceMemoPlayer.tsx
index 7bb1a11..910b80e 100644
--- a/client/src/components/VoiceMemoPlayer.tsx
+++ b/client/src/components/VoiceMemoPlayer.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react'
+import { useEffect, useState, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { db } from '../services/db.js'
 import { getActiveMasterKey } from '../services/auth.js'
@@ -30,6 +30,29 @@ export default function VoiceMemoPlayer({
   const [src, setSrc] = useState<string | null>(preloaded?.audio ?? null)
   const [error, setError] = useState(false)
 
+  const audioRef = useRef<HTMLAudioElement | null>(null)
+
+  useEffect(() => {
+    const el = audioRef.current
+    if (!el) return
+
+    const handleLoadedMetadata = () => {
+      if (el.duration === Infinity || isNaN(el.duration) || el.duration === 0) {
+        el.currentTime = 1e10
+        const onTimeUpdate = () => {
+          el.currentTime = 0
+          el.removeEventListener('timeupdate', onTimeUpdate)
+        }
+        el.addEventListener('timeupdate', onTimeUpdate)
+      }
+    }
+
+    el.addEventListener('loadedmetadata', handleLoadedMetadata)
+    return () => {
+      el.removeEventListener('loadedmetadata', handleLoadedMetadata)
+    }
+  }, [src])
+
   useEffect(() => {
     if (preloaded?.audio) {
       setSrc(preloaded.audio)
@@ -75,7 +98,7 @@ export default function VoiceMemoPlayer({
 
   return (
     <div className="voice-memo-player-shell">
-      <audio className={playerClass} controls preload="none" src={src} />
+      <audio ref={audioRef} className={playerClass} controls preload="none" src={src} />
     </div>
   )
 }