diff --git a/core/ffmpeg/ffmpeg.go b/core/ffmpeg/ffmpeg.go
index 0b8a927a0..712e220af 100644
--- a/core/ffmpeg/ffmpeg.go
+++ b/core/ffmpeg/ffmpeg.go
@@ -153,31 +153,27 @@ func (j *ffCmd) wait() {
 
 // Path will always be an absolute path
 func createFFmpegCommand(cmd, path string, maxBitRate, offset int) []string {
-	split := strings.Split(fixCmd(cmd), " ")
-	var parts []string
-
-	for _, s := range split {
+	var args []string
+	for _, s := range fixCmd(cmd) {
 		if strings.Contains(s, "%s") {
 			s = strings.ReplaceAll(s, "%s", path)
-			parts = append(parts, s)
+			args = append(args, s)
 			if offset > 0 && !strings.Contains(cmd, "%t") {
-				parts = append(parts, "-ss", strconv.Itoa(offset))
+				args = append(args, "-ss", strconv.Itoa(offset))
 			}
 		} else {
 			s = strings.ReplaceAll(s, "%t", strconv.Itoa(offset))
 			s = strings.ReplaceAll(s, "%b", strconv.Itoa(maxBitRate))
-			parts = append(parts, s)
+			args = append(args, s)
 		}
 	}
 
-	return parts
+	return args
 }
 
 func createProbeCommand(cmd string, inputs []string) []string {
-	split := strings.Split(fixCmd(cmd), " ")
 	var args []string
-
-	for _, s := range split {
+	for _, s := range fixCmd(cmd) {
 		if s == "%s" {
 			for _, inp := range inputs {
 				args = append(args, "-i", inp)
@@ -189,7 +185,7 @@ func createProbeCommand(cmd string, inputs []string) []string {
 	return args
 }
 
-func fixCmd(cmd string) string {
+func fixCmd(cmd string) []string {
 	split := strings.Split(cmd, " ")
 	var result []string
 	cmdPath, _ := ffmpegCmd()
@@ -200,7 +196,7 @@ func fixCmd(cmd string) string {
 			result = append(result, s)
 		}
 	}
-	return strings.Join(result, " ")
+	return result
 }
 
 func ffmpegCmd() (string, error) {
@@ -223,6 +219,7 @@ func ffmpegCmd() (string, error) {
 	return ffmpegPath, ffmpegErr
 }
 
+// These variables are accessible here for tests. Do not use them directly in production code. Use ffmpegCmd() instead.
 var (
 	ffOnce     sync.Once
 	ffmpegPath string
diff --git a/core/ffmpeg/ffmpeg_test.go b/core/ffmpeg/ffmpeg_test.go
index 71d874083..4b8437e2c 100644
--- a/core/ffmpeg/ffmpeg_test.go
+++ b/core/ffmpeg/ffmpeg_test.go
@@ -48,4 +48,17 @@ var _ = Describe("ffmpeg", func() {
 			Expect(args).To(Equal([]string{"ffmpeg", "-i", "/music library/one.mp3", "-i", "/music library/two.mp3", "-f", "ffmetadata"}))
 		})
 	})
+
+	When("ffmpegPath is set", func() {
+		It("returns the correct ffmpeg path", func() {
+			ffmpegPath = "/usr/bin/ffmpeg"
+			args := createProbeCommand(probeCmd, []string{"one.mp3"})
+			Expect(args).To(Equal([]string{"/usr/bin/ffmpeg", "-i", "one.mp3", "-f", "ffmetadata"}))
+		})
+		It("returns the correct ffmpeg path with spaces", func() {
+			ffmpegPath = "/usr/bin/with spaces/ffmpeg.exe"
+			args := createProbeCommand(probeCmd, []string{"one.mp3"})
+			Expect(args).To(Equal([]string{"/usr/bin/with spaces/ffmpeg.exe", "-i", "one.mp3", "-f", "ffmetadata"}))
+		})
+	})
 })