diff --git a/public/main/inc/ajax/record_audio_rtc.ajax.php b/public/main/inc/ajax/record_audio_rtc.ajax.php
index 2eb99a6cd3..2782ea21d9 100644
--- a/public/main/inc/ajax/record_audio_rtc.ajax.php
+++ b/public/main/inc/ajax/record_audio_rtc.ajax.php
@@ -37,7 +37,7 @@ switch ($type) {
     case Asset::EXERCISE_ATTEMPT:
         $asset = (new Asset())
             ->setCategory(Asset::EXERCISE_ATTEMPT)
-            ->setTitle("oral_expression_{$questionId}_$userId")
+            ->setTitle($_FILES['audio_blob']['name'])
         ;
 
         $asset = $assetRepo->createFromRequest($asset, $_FILES['audio_blob']);
diff --git a/public/main/inc/lib/javascript/record_audio/record_audio.js b/public/main/inc/lib/javascript/record_audio/record_audio.js
index b59708c5b8..01dd36917b 100644
--- a/public/main/inc/lib/javascript/record_audio/record_audio.js
+++ b/public/main/inc/lib/javascript/record_audio/record_audio.js
@@ -61,7 +61,9 @@ window.RecordAudio = (function () {
 
             var btnSaveText = btnSave ? btnSave.html() : '';
 
+            var typeParts = recordedBlob.type.split('/');
             var fileName = 'oral_expression_' + rtcInfo.tExerciseId + '_' + rtcInfo.questionId;
+            fileName += typeParts.length > 1 ? '.' + typeParts[1] : '';
 
             var formData = new FormData();
             formData.append('type', rtcInfo.type);