diff --git a/pkg/ffmpeg/encoder.go b/pkg/ffmpeg/encoder.go
index 47c780f3a..da9d4d7a5 100644
--- a/pkg/ffmpeg/encoder.go
+++ b/pkg/ffmpeg/encoder.go
@@ -4,6 +4,7 @@ import (
 	"github.com/stashapp/stash/pkg/logger"
 	"io/ioutil"
 	"os/exec"
+	"strings"
 )
 
 type Encoder struct {
@@ -53,6 +54,7 @@ func (e *Encoder) run(probeResult VideoFile, args []string) (string, error) {
 	stdoutString := string(stdoutData)
 
 	if err := cmd.Wait(); err != nil {
+		logger.Errorf("ffmpeg error when running command <%s>", strings.Join(cmd.Args, " "))
 		return stdoutString, err
 	}
 
diff --git a/pkg/ffmpeg/encoder_marker.go b/pkg/ffmpeg/encoder_marker.go
index 3ccd86a37..07e2124cc 100644
--- a/pkg/ffmpeg/encoder_marker.go
+++ b/pkg/ffmpeg/encoder_marker.go
@@ -18,6 +18,7 @@ func (e *Encoder) SceneMarkerVideo(probeResult VideoFile, options SceneMarkerOpt
 		"-ss", strconv.Itoa(options.Seconds),
 		"-t", "20",
 		"-i", probeResult.Path,
+		"-max_muxing_queue_size", "1024", // https://trac.ffmpeg.org/ticket/6375
 		"-c:v", "libx264",
 		"-profile:v", "high",
 		"-level", "4.2",