diff --git a/src/components/nodes/OutputNode.tsx b/src/components/nodes/OutputNode.tsx
index 9e030601..e36c392f 100644
--- a/src/components/nodes/OutputNode.tsx
+++ b/src/components/nodes/OutputNode.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useState } from "react";
+import { useCallback, useState, useMemo } from "react";
 import { Handle, Position, NodeProps, Node } from "@xyflow/react";
 import { BaseNode } from "./BaseNode";
 import { useWorkflowStore } from "@/store/workflowStore";
@@ -13,16 +13,55 @@ export function OutputNode({ id, data, selected }: NodeProps<OutputNodeType>) {
   const updateNodeData = useWorkflowStore((state) => state.updateNodeData);
   const [showLightbox, setShowLightbox] = useState(false);
 
-  const handleDownload = useCallback(() => {
-    if (!nodeData.image) return;
+  // Determine if content is video
+  const isVideo = useMemo(() => {
+    if (nodeData.video) return true;
+    if (nodeData.contentType === "video") return true;
+    if (nodeData.image?.startsWith("data:video/")) return true;
+    if (nodeData.image?.includes(".mp4") || nodeData.image?.includes(".webm")) return true;
+    return false;
+  }, [nodeData.video, nodeData.contentType, nodeData.image]);
 
+  // Get the content source (video or image)
+  const contentSrc = useMemo(() => {
+    if (nodeData.video) return nodeData.video;
+    return nodeData.image;
+  }, [nodeData.video, nodeData.image]);
+
+  const handleDownload = useCallback(async () => {
+    if (!contentSrc) return;
+
+    const timestamp = Date.now();
+    const filename = isVideo ? `generated-${timestamp}.mp4` : `generated-${timestamp}.png`;
+
+    // Handle URL-based content (needs fetch + blob conversion)
+    if (contentSrc.startsWith("http://") || contentSrc.startsWith("https://")) {
+      try {
+        const response = await fetch(contentSrc);
+        const blob = await response.blob();
+        const blobUrl = URL.createObjectURL(blob);
+
+        const link = document.createElement("a");
+        link.href = blobUrl;
+        link.download = filename;
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+        URL.revokeObjectURL(blobUrl);
+      } catch (error) {
+        console.error("Failed to download:", error);
+      }
+      return;
+    }
+
+    // Handle data URL content (direct download)
     const link = document.createElement("a");
-    link.href = nodeData.image;
-    link.download = `generated-${Date.now()}.png`;
+    link.href = contentSrc;
+    link.download = filename;
     document.body.appendChild(link);
     link.click();
     document.body.removeChild(link);
-  }, [nodeData.image]);
+  }, [contentSrc, isVideo]);
 
   return (
     <>
@@ -43,18 +82,31 @@ export function OutputNode({ id, data, selected }: NodeProps<OutputNodeType>) {
           data-handletype="image"
         />
 
-        {nodeData.image ? (
+        {contentSrc ? (
           <div className="flex-1 flex flex-col min-h-0 gap-2">
             <div
               className="relative cursor-pointer group flex-1 min-h-0"
               onClick={() => setShowLightbox(true)}
             >
-              <img
-                src={nodeData.image}
-                alt="Output"
-                className="w-full h-full object-contain rounded"
-              />
-              <div className="absolute inset-0 bg-black/0 group-hover:bg-black/10 transition-colors flex items-center justify-center rounded">
+              {isVideo ? (
+                <video
+                  src={contentSrc}
+                  controls
+                  loop
+                  muted
+                  autoPlay
+                  playsInline
+                  className="w-full h-full object-contain rounded"
+                  onClick={(e) => e.stopPropagation()}
+                />
+              ) : (
+                <img
+                  src={contentSrc}
+                  alt="Output"
+                  className="w-full h-full object-contain rounded"
+                />
+              )}
+              <div className="absolute inset-0 bg-black/0 group-hover:bg-black/10 transition-colors flex items-center justify-center rounded pointer-events-none">
                 <span className="text-[10px] font-medium text-white opacity-0 group-hover:opacity-100 transition-opacity bg-black/50 px-2 py-1 rounded">
                   View full size
                 </span>
@@ -69,23 +121,35 @@ export function OutputNode({ id, data, selected }: NodeProps<OutputNodeType>) {
           </div>
         ) : (
           <div className="w-full flex-1 min-h-[144px] border border-dashed border-neutral-600 rounded flex items-center justify-center">
-            <span className="text-neutral-500 text-[10px]">Waiting for image</span>
+            <span className="text-neutral-500 text-[10px]">Waiting for image or video</span>
           </div>
         )}
       </BaseNode>
 
       {/* Lightbox Modal */}
-      {showLightbox && nodeData.image && (
+      {showLightbox && contentSrc && (
         <div
           className="fixed inset-0 bg-black/90 z-[100] flex items-center justify-center p-8"
           onClick={() => setShowLightbox(false)}
         >
           <div className="relative max-w-full max-h-full">
-            <img
-              src={nodeData.image}
-              alt="Output full size"
-              className="max-w-full max-h-[90vh] object-contain rounded"
-            />
+            {isVideo ? (
+              <video
+                src={contentSrc}
+                controls
+                loop
+                autoPlay
+                playsInline
+                className="max-w-full max-h-[90vh] object-contain rounded"
+                onClick={(e) => e.stopPropagation()}
+              />
+            ) : (
+              <img
+                src={contentSrc}
+                alt="Output full size"
+                className="max-w-full max-h-[90vh] object-contain rounded"
+              />
+            )}
             <button
               onClick={() => setShowLightbox(false)}
               className="absolute top-4 right-4 w-8 h-8 bg-white/10 hover:bg-white/20 rounded text-white text-sm transition-colors flex items-center justify-center"
diff --git a/src/types/index.ts b/src/types/index.ts
index cd730ab8..ba756069 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -181,6 +181,8 @@ export interface LLMGenerateNodeData extends BaseNodeData {
 export interface OutputNodeData extends BaseNodeData {
   image: string | null;
   imageRef?: string;  // External image reference for storage optimization
+  video?: string | null;  // Video data URL or HTTP URL
+  contentType?: "image" | "video";  // Explicit content type hint
 }
 
 // Split Grid Node Data (Utility Node)