diff --git a/client/src/main/java/ctbrec/ui/tabs/RecordingsTab.java b/client/src/main/java/ctbrec/ui/tabs/RecordingsTab.java
index 99307077..fcc18db2 100644
--- a/client/src/main/java/ctbrec/ui/tabs/RecordingsTab.java
+++ b/client/src/main/java/ctbrec/ui/tabs/RecordingsTab.java
@@ -489,10 +489,8 @@ public class RecordingsTab extends Tab implements TabSelectionListener {
     private String proposeTargetFilename(Recording recording) {
         String path = recording.getPath().substring(1);
         if(recording.isSegmented()) {
-            String filename = path.replace("/", "-");
-            if(!filename.endsWith(".mp4")) {
-                filename += ".mp4";
-            }
+            String fileSuffix = config.getSettings().ffmpegFileSuffix;
+            String filename = path.replace("/", "-").replace(".mp4", "") + '.' + fileSuffix;
             return filename;
         } else {
             return new File(path).getName();