diff --git a/Session/Media Viewing & Editing/PhotoCapture.swift b/Session/Media Viewing & Editing/PhotoCapture.swift
index 41ec6bb30..50720f6f6 100644
--- a/Session/Media Viewing & Editing/PhotoCapture.swift	
+++ b/Session/Media Viewing & Editing/PhotoCapture.swift	
@@ -6,6 +6,7 @@ import Foundation
 import AVFoundation
 import PromiseKit
 import CoreServices
+import SessionMessagingKit
 
 protocol PhotoCaptureDelegate: AnyObject {
     func photoCapture(_ photoCapture: PhotoCapture, didFinishProcessingAttachment attachment: SignalAttachment)
@@ -463,6 +464,9 @@ class CaptureOutput {
         // leaving it enabled causes all audio to be lost on videos longer
         // than the default length (10s).
         movieOutput.movieFragmentInterval = CMTime.invalid
+        
+        // Ensure the recorded movie can't go over the maximum file server size
+        movieOutput.maxRecordedFileSize = Int64(FileServerAPI.maxFileSize)
     }
 
     var photoOutput: AVCaptureOutput? {