diff --git a/Packages/DesignSystem/Sources/DesignSystem/Views/StatusEditorToolbarItem.swift b/Packages/DesignSystem/Sources/DesignSystem/Views/StatusEditorToolbarItem.swift
index 21ecde43..d94706d6 100644
--- a/Packages/DesignSystem/Sources/DesignSystem/Views/StatusEditorToolbarItem.swift
+++ b/Packages/DesignSystem/Sources/DesignSystem/Views/StatusEditorToolbarItem.swift
@@ -1,6 +1,7 @@
 import SwiftUI
 import Env
 
+@MainActor
 extension View {
   public func statusEditorToolbarItem(routeurPath: RouterPath) -> some ToolbarContent {
     ToolbarItem(placement: .navigationBarTrailing) {
diff --git a/Packages/Models/Sources/Models/MediaAttachement.swift b/Packages/Models/Sources/Models/MediaAttachement.swift
index d63ee485..30a06db3 100644
--- a/Packages/Models/Sources/Models/MediaAttachement.swift
+++ b/Packages/Models/Sources/Models/MediaAttachement.swift
@@ -11,7 +11,7 @@ public struct MediaAttachement: Codable, Identifiable, Hashable {
   }
   
   public enum SupportedType: String {
-    case image, gifv
+    case image, gifv, video
   }
   
   public func hash(into hasher: inout Hasher) {
diff --git a/Packages/Status/Sources/Status/Row/StatusMediaPreviewView.swift b/Packages/Status/Sources/Status/Row/StatusMediaPreviewView.swift
index d0592b68..00dd156b 100644
--- a/Packages/Status/Sources/Status/Row/StatusMediaPreviewView.swift
+++ b/Packages/Status/Sources/Status/Row/StatusMediaPreviewView.swift
@@ -126,7 +126,7 @@ public struct StatusMediaPreviewView: View {
                   .shimmering()
               })
       }
-    case .gifv:
+    case .gifv, .video:
       if let url = attachement.url {
         VideoPlayerView(viewModel: .init(url: url))
           .frame(height: imageMaxHeight)
@@ -158,7 +158,7 @@ public struct StatusMediaPreviewView: View {
             }
             .frame(width: isCompact ? imageMaxHeight : proxy.frame(in: .local).width)
             .frame(height: imageMaxHeight)
-          case .gifv:
+          case .gifv, .video:
             if let url = attachement.url {
               VideoPlayerView(viewModel: .init(url: url))
                 .frame(width: isCompact ? imageMaxHeight :  proxy.frame(in: .local).width)