diff --git a/backend/src/services/rustfs.ts b/backend/src/services/rustfs.ts
index 3d5e9b8..1f54aec 100644
--- a/backend/src/services/rustfs.ts
+++ b/backend/src/services/rustfs.ts
@@ -7,7 +7,6 @@ import {
     CompleteMultipartUploadCommand,
     AbortMultipartUploadCommand,
     GetObjectCommand,
-    HeadObjectCommand,
 } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 
@@ -169,61 +168,49 @@ export async function getVideoStream(
 ): Promise<VideoStreamResult> {
     const s3 = getRustFsClient();
 
-    // Get object metadata first to know total size
-    const headResult = await s3.send(
-        new HeadObjectCommand({
-            Bucket: RUSTFS_BUCKET,
-            Key: key,
-        }),
-    );
-    const totalSize = headResult.ContentLength ?? 0;
-    const contentType = headResult.ContentType || "video/webm";
-
-    let range: { start: number; end: number } | undefined;
-    let command: GetObjectCommand;
-
-    if (rangeHeader) {
-        // Parse Range header like "bytes=0-1023" or "bytes=1024-"
-        const match = rangeHeader.match(/bytes=(\d*)-(\d*)/);
-        if (match) {
-            const start = match[1] ? parseInt(match[1], 10) : 0;
-            const end = match[2] ? parseInt(match[2], 10) : totalSize - 1;
-            range = { start, end: Math.min(end, totalSize - 1) };
-
-            command = new GetObjectCommand({
-                Bucket: RUSTFS_BUCKET,
-                Key: key,
-                Range: `bytes=${range.start}-${range.end}`,
-            });
-        } else {
-            command = new GetObjectCommand({
-                Bucket: RUSTFS_BUCKET,
-                Key: key,
-            });
-        }
-    } else {
-        command = new GetObjectCommand({
-            Bucket: RUSTFS_BUCKET,
-            Key: key,
-        });
-    }
+    // Build the GetObject command, optionally with a Range
+    const command = new GetObjectCommand({
+        Bucket: RUSTFS_BUCKET,
+        Key: key,
+        ...(rangeHeader ? { Range: rangeHeader } : {}),
+    });
 
     const result = await s3.send(command);
     if (!result.Body) {
         throw new Error("Empty response body from RustFS");
     }
 
+    const contentType = result.ContentType || "video/webm";
+
     // Convert SDK stream to web ReadableStream
     const sdkStream = result.Body as any;
     const webStream: ReadableStream<Uint8Array> = sdkStream.transformToWebStream
         ? sdkStream.transformToWebStream()
         : sdkStream;
 
+    // If we sent a range request, parse the Content-Range header from S3
+    // Format: "bytes start-end/total"
+    if (rangeHeader && result.ContentRange) {
+        const match = result.ContentRange.match(/bytes (\d+)-(\d+)\/(\d+)/);
+        if (match) {
+            const start = parseInt(match[1], 10);
+            const end = parseInt(match[2], 10);
+            const totalSize = parseInt(match[3], 10);
+            return {
+                stream: webStream,
+                contentType,
+                contentLength: totalSize,
+                range: { start, end },
+            };
+        }
+    }
+
+    // No range request (or no Content-Range in response) — full object
     return {
         stream: webStream,
         contentType,
-        contentLength: totalSize,
-        range,
+        contentLength: result.ContentLength ?? 0,
+        range: undefined,
     };
 }
 
diff --git a/frontend/src/components/VideoPlayer.tsx b/frontend/src/components/VideoPlayer.tsx
index 7c72c21..9e36edb 100644
--- a/frontend/src/components/VideoPlayer.tsx
+++ b/frontend/src/components/VideoPlayer.tsx
@@ -1,79 +1,19 @@
-import { useState, useRef } from "react";
 import type { VideoDetail } from "../types/video";
 import { formatRunTime } from "../api/client";
 
 export default function VideoPlayer({ video }: { video: VideoDetail }) {
-    const [loaded, setLoaded] = useState(false);
-    const [error, setError] = useState(false);
-    const videoRef = useRef<HTMLVideoElement>(null);
-
     return (
         <div className="rounded-lg border border-white/5 overflow-hidden">
-            <div className="aspect-video bg-black relative">
-                {/* Loading state */}
-                {!loaded && !error && (
-                    <div className="absolute inset-0 flex items-center justify-center z-10">
-                        {video.thumbnailUrl && (
-                            <img
-                                src={video.thumbnailUrl}
-                                alt=""
-                                className="absolute inset-0 w-full h-full object-cover blur-sm opacity-50"
-                            />
-                        )}
-                        <div className="relative z-20 flex flex-col items-center gap-2">
-                            <div className="w-10 h-10 rounded-full border-2 border-white/20 border-t-white/80 animate-spin" />
-                            <span className="text-xs text-white/40">
-                                Loading video…
-                            </span>
-                        </div>
-                    </div>
-                )}
-
-                {/* Error state */}
-                {error && (
-                    <div className="absolute inset-0 flex items-center justify-center z-10">
-                        {video.thumbnailUrl && (
-                            <img
-                                src={video.thumbnailUrl}
-                                alt=""
-                                className="absolute inset-0 w-full h-full object-cover opacity-30"
-                            />
-                        )}
-                        <div className="relative z-20 flex flex-col items-center gap-2">
-                            <svg
-                                className="w-12 h-12 text-red-400/60"
-                                fill="none"
-                                stroke="currentColor"
-                                viewBox="0 0 24 24"
-                            >
-                                <path
-                                    strokeLinecap="round"
-                                    strokeLinejoin="round"
-                                    strokeWidth={1.5}
-                                    d="M12 9v2m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
-                                />
-                            </svg>
-                            <span className="text-xs text-white/40">
-                                Failed to load video
-                            </span>
-                        </div>
-                    </div>
-                )}
-
-                <video
-                    ref={videoRef}
-                    src={video.videoUrl}
-                    controls
-                    playsInline
-                    preload="metadata"
-                    className="w-full h-full object-contain"
-                    poster={video.thumbnailUrl}
-                    onCanPlay={() => setLoaded(true)}
-                    onError={() => setError(true)}
-                >
-                    Your browser does not support video playback.
-                </video>
-            </div>
+            <video
+                src={video.videoUrl}
+                controls
+                playsInline
+                preload="metadata"
+                poster={video.thumbnailUrl}
+                className="w-full aspect-video bg-black object-contain"
+            >
+                Your browser does not support video playback.
+            </video>
 
             <div className="px-4 py-3 flex items-center justify-between border-t border-white/5 bg-white/3">
                 <a
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 3f3cf05..24c2ba3 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -24,15 +24,3 @@ a {
     color: #1896d3;
     text-decoration: none;
 }
-
-video::-webkit-media-controls {
-    opacity: 1;
-}
-
-video::-webkit-media-controls-enclosure {
-    border-radius: 0;
-}
-
-video::-webkit-media-controls-panel {
-    background: rgba(0, 0, 0, 0.75);
-}