diff --git a/src/app/(modules)/upload/components/ProcessedVideoDialog.tsx b/src/app/(modules)/upload/components/ProcessedVideoDialog.tsx
deleted file mode 100644
index 107ca72..0000000
--- a/src/app/(modules)/upload/components/ProcessedVideoDialog.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-'use client';
-
-import { Loader2 } from 'lucide-react';
-
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog';
-import { useAnnotatedVideoQuery } from '@/app/(modules)/results/hooks/useVideoResults';
-import type { UploadVideo } from '@/types';
-
-interface ProcessedVideoDialogProps {
-  upload: UploadVideo | null;
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-}
-
-export function ProcessedVideoDialog({
-  upload,
-  open,
-  onOpenChange,
-}: ProcessedVideoDialogProps) {
-  const { videoUrl, isLoading, isError } = useAnnotatedVideoQuery(
-    open ? upload?.processed_video_url ?? undefined : undefined,
-  );
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="sm:max-w-4xl">
-        <DialogHeader>
-          <DialogTitle>{upload?.filename ?? 'Processed Video'}</DialogTitle>
-          <DialogDescription>Processed video preview</DialogDescription>
-        </DialogHeader>
-
-        <div className="flex aspect-video items-center justify-center overflow-hidden rounded-md border bg-muted/30">
-          {isLoading ? (
-            <Loader2 className="size-6 animate-spin text-primary" />
-          ) : isError || !videoUrl ? (
-            <p className="text-sm text-muted-foreground">
-              Processed video is not available.
-            </p>
-          ) : (
-            <video src={videoUrl} controls className="h-full w-full" />
-          )}
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}
-
diff --git a/src/app/(modules)/upload/components/UploadActionsMenu.tsx b/src/app/(modules)/upload/components/UploadActionsMenu.tsx
index 89f25df..8e7d964 100644
--- a/src/app/(modules)/upload/components/UploadActionsMenu.tsx
+++ b/src/app/(modules)/upload/components/UploadActionsMenu.tsx
@@ -13,14 +13,14 @@ import type { UploadVideo } from '@/types';
 
 interface UploadActionsMenuProps {
   upload: UploadVideo;
+  onViewVideo: (upload: UploadVideo) => void;
   onViewDetails: (upload: UploadVideo) => void;
-  onViewProcessedVideo: (upload: UploadVideo) => void;
 }
 
 export function UploadActionsMenu({
   upload,
+  onViewVideo,
   onViewDetails,
-  onViewProcessedVideo,
 }: UploadActionsMenuProps) {
   return (
     <DropdownMenu>
@@ -37,16 +37,26 @@ export function UploadActionsMenu({
         </Button>
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end">
-        <DropdownMenuItem onClick={() => onViewDetails(upload)}>
+        {upload.video_url ? (
+          <DropdownMenuItem
+            onClick={(event) => {
+              event.stopPropagation();
+              onViewVideo(upload);
+            }}
+          >
+            <PlayCircle className="size-4" />
+            View Video
+          </DropdownMenuItem>
+        ) : null}
+        <DropdownMenuItem
+          onClick={(event) => {
+            event.stopPropagation();
+            onViewDetails(upload);
+          }}
+        >
           <Eye className="size-4" />
           View Details
         </DropdownMenuItem>
-        {upload.processed_video_url ? (
-          <DropdownMenuItem onClick={() => onViewProcessedVideo(upload)}>
-            <PlayCircle className="size-4" />
-            View Processed Video
-          </DropdownMenuItem>
-        ) : null}
       </DropdownMenuContent>
     </DropdownMenu>
   );
diff --git a/src/app/(modules)/upload/components/UploadCardGrid.tsx b/src/app/(modules)/upload/components/UploadCardGrid.tsx
index ebbc280..6423f9f 100644
--- a/src/app/(modules)/upload/components/UploadCardGrid.tsx
+++ b/src/app/(modules)/upload/components/UploadCardGrid.tsx
@@ -21,8 +21,8 @@ interface UploadCardGridProps {
   onLimitChange: (limit: number) => void;
   onUploadNew: () => void;
   onOpenUpload: (upload: UploadVideo) => void;
+  onViewVideo: (upload: UploadVideo) => void;
   onViewDetails: (upload: UploadVideo) => void;
-  onViewProcessedVideo: (upload: UploadVideo) => void;
 }
 
 export function UploadCardGrid({
@@ -35,8 +35,8 @@ export function UploadCardGrid({
   onLimitChange,
   onUploadNew,
   onOpenUpload,
+  onViewVideo,
   onViewDetails,
-  onViewProcessedVideo,
 }: UploadCardGridProps) {
   const skeletonItems = Array.from({ length: Math.min(limit, 20) });
 
@@ -85,8 +85,8 @@ export function UploadCardGrid({
                   </div>
                   <UploadActionsMenu
                     upload={upload}
+                    onViewVideo={onViewVideo}
                     onViewDetails={onViewDetails}
-                    onViewProcessedVideo={onViewProcessedVideo}
                   />
                 </div>
               </CardContent>
diff --git a/src/app/(modules)/upload/components/UploadColumns.tsx b/src/app/(modules)/upload/components/UploadColumns.tsx
index cd15ecc..8bbaa4a 100644
--- a/src/app/(modules)/upload/components/UploadColumns.tsx
+++ b/src/app/(modules)/upload/components/UploadColumns.tsx
@@ -10,13 +10,13 @@ import { Badge } from '@/components/ui/badge';
 import type { UploadVideo } from '@/types';
 
 interface UseUploadColumnsProps {
+  onViewVideo: (upload: UploadVideo) => void;
   onViewDetails: (upload: UploadVideo) => void;
-  onViewProcessedVideo: (upload: UploadVideo) => void;
 }
 
 export function useUploadColumns({
+  onViewVideo,
   onViewDetails,
-  onViewProcessedVideo,
 }: UseUploadColumnsProps) {
   return useMemo<ColumnDef<UploadVideo>[]>(
     () => [
@@ -65,13 +65,13 @@ export function useUploadColumns({
           <div className="flex justify-center">
             <UploadActionsMenu
               upload={row.original}
+              onViewVideo={onViewVideo}
               onViewDetails={onViewDetails}
-              onViewProcessedVideo={onViewProcessedVideo}
             />
           </div>
         ),
       },
     ],
-    [onViewDetails, onViewProcessedVideo],
+    [onViewDetails, onViewVideo],
   );
 }
diff --git a/src/app/(modules)/upload/components/UploadVideoDialog.tsx b/src/app/(modules)/upload/components/UploadVideoDialog.tsx
new file mode 100644
index 0000000..6ca09b4
--- /dev/null
+++ b/src/app/(modules)/upload/components/UploadVideoDialog.tsx
@@ -0,0 +1,44 @@
+'use client';
+
+import { ProtectedVideoPlayer } from '@/components/media/ProtectedVideoPlayer';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+} from '@/components/ui/dialog';
+import type { UploadVideo } from '@/types';
+
+interface UploadVideoDialogProps {
+  upload: UploadVideo | null;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}
+
+export function UploadVideoDialog({
+  upload,
+  open,
+  onOpenChange,
+}: UploadVideoDialogProps) {
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="gap-3 p-3 sm:max-w-5xl sm:p-4">
+        <DialogHeader className="min-w-0 pr-8">
+          <DialogTitle className="truncate text-left text-base">
+            Video Preview
+          </DialogTitle>
+          <DialogDescription className="truncate text-xs">
+            {upload?.filename ?? 'Uploaded video'}
+          </DialogDescription>
+        </DialogHeader>
+
+        <ProtectedVideoPlayer
+          url={open ? upload?.video_url : undefined}
+          className="rounded-lg"
+          unavailableTitle="Video preview unavailable"
+        />
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/src/app/(modules)/upload/page.tsx b/src/app/(modules)/upload/page.tsx
index 11ac0e1..6f44623 100644
--- a/src/app/(modules)/upload/page.tsx
+++ b/src/app/(modules)/upload/page.tsx
@@ -8,11 +8,11 @@ import { Button } from '@/components/ui/button';
 import type { UploadVideo } from '@/types';
 
 import { CreateUploadDialog } from './components/CreateUploadDialog';
-import { ProcessedVideoDialog } from './components/ProcessedVideoDialog';
 import { UploadCardGrid } from './components/UploadCardGrid';
 import { useUploadColumns } from './components/UploadColumns';
 import { UploadDetailsDialog } from './components/UploadDetailsDialog';
 import { UploadTable } from './components/UploadTable';
+import { UploadVideoDialog } from './components/UploadVideoDialog';
 import { ViewSwitcher } from './components/ViewSwitcher';
 import { useUploadFilters } from './hooks/useUploadFilters';
 import { useMyUploadsQuery } from './hooks/useUploadQueries';
@@ -23,9 +23,7 @@ export default function UploadPage() {
   const uploadsQuery = useMyUploadsQuery({ skip, limit });
   const [isCreateOpen, setIsCreateOpen] = useState(false);
   const [detailsUpload, setDetailsUpload] = useState<UploadVideo | null>(null);
-  const [processedUpload, setProcessedUpload] = useState<UploadVideo | null>(
-    null,
-  );
+  const [videoUpload, setVideoUpload] = useState<UploadVideo | null>(null);
 
   const uploads = uploadsQuery.data?.items ?? [];
   const total = uploadsQuery.data?.total ?? 0;
@@ -35,24 +33,22 @@ export default function UploadPage() {
     setDetailsUpload(upload);
   }, []);
 
-  const handleViewProcessedVideo = useCallback((upload: UploadVideo) => {
-    setProcessedUpload(upload);
+  const handleViewUploadVideo = useCallback((upload: UploadVideo) => {
+    setVideoUpload(upload);
   }, []);
 
   const handleOpenUpload = useCallback(
     (upload: UploadVideo) => {
-      if (upload.processed_video_url) {
-        handleViewProcessedVideo(upload);
-        return;
+      if (upload.video_url) {
+        handleViewUploadVideo(upload);
       }
-      handleViewDetails(upload);
     },
-    [handleViewDetails, handleViewProcessedVideo],
+    [handleViewUploadVideo],
   );
 
   const columns = useUploadColumns({
+    onViewVideo: handleViewUploadVideo,
     onViewDetails: handleViewDetails,
-    onViewProcessedVideo: handleViewProcessedVideo,
   });
 
   return (
@@ -85,8 +81,8 @@ export default function UploadPage() {
             onLimitChange={setLimit}
             onUploadNew={() => setIsCreateOpen(true)}
             onOpenUpload={handleOpenUpload}
+            onViewVideo={handleViewUploadVideo}
             onViewDetails={handleViewDetails}
-            onViewProcessedVideo={handleViewProcessedVideo}
           />
         ) : (
           <UploadTable
@@ -111,11 +107,11 @@ export default function UploadPage() {
           if (!open) setDetailsUpload(null);
         }}
       />
-      <ProcessedVideoDialog
-        upload={processedUpload}
-        open={Boolean(processedUpload)}
+      <UploadVideoDialog
+        upload={videoUpload}
+        open={Boolean(videoUpload)}
         onOpenChange={(open) => {
-          if (!open) setProcessedUpload(null);
+          if (!open) setVideoUpload(null);
         }}
       />
     </>
diff --git a/src/components/media/ProtectedVideoPlayer.tsx b/src/components/media/ProtectedVideoPlayer.tsx
index b8c47af..0cc7c74 100644
--- a/src/components/media/ProtectedVideoPlayer.tsx
+++ b/src/components/media/ProtectedVideoPlayer.tsx
@@ -1,8 +1,7 @@
 'use client';
 
-import { Video } from 'lucide-react';
+import { Loader2, Video } from 'lucide-react';
 
-import { Skeleton } from '@/components/ui/skeleton';
 import { useProtectedMediaObjectUrl } from '@/hooks/useProtectedMedia';
 import { cn } from '@/lib/utils';
 
@@ -39,9 +38,20 @@ export function ProtectedVideoPlayer({
 
   if (isLoading) {
     return (
-      <Skeleton
-        className={cn('aspect-video w-full rounded-md border', className)}
-      />
+      <div
+        className={cn(
+          'flex aspect-video w-full flex-col items-center justify-center gap-3 rounded-md border bg-muted/30 text-foreground',
+          className,
+        )}
+      >
+        <Loader2 className="size-7 animate-spin text-primary" />
+        <div className="text-center">
+          <p className="text-sm font-medium">Loading video</p>
+          <p className="mt-1 text-xs text-muted-foreground">
+            Preparing secure playback...
+          </p>
+        </div>
+      </div>
     );
   }
 
diff --git a/src/types/upload.ts b/src/types/upload.ts
index 7c489e9..fce6cc8 100644
--- a/src/types/upload.ts
+++ b/src/types/upload.ts
@@ -13,6 +13,7 @@ export interface UploadVideo {
   uploaded_at: string;
   uploaded_by_user_id?: number | null;
   uploaded_by_email?: string | null;
+  video_url?: string | null;
   processed_video_path?: string | null;
   processed_video_url?: string | null;
   status: UploadVideoStatus;
@@ -22,4 +23,3 @@ export interface UploadVideosResponse {
   items: UploadVideo[];
   total: number;
 }
-