diff --git a/CHANGELOG.md b/CHANGELOG.md
index d24b4cc1bea0422cc2d3d2c648da45ada0ae6a5d..627b1a1b742f3c4f9cc3eb6b27e4d423740f79f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 * Fixed rich oEmbed URL previews (Twitter).
 * Fixed photo oEmbed URL previews (Giphy).
 * Fixed orientation parsing for some thumbnails.
+* Fixed file name being incorrect on the first download from remote servers.
 
 ## [1.2.4] - March 5th, 2021
 
diff --git a/controllers/download_controller/download_resource_handler.go b/controllers/download_controller/download_resource_handler.go
index 59e8349c13d82160713762d2dfe2dffb90c9cadc..cbaad5d7cc35de91da8d401d12ddd6b45f14f7be 100644
--- a/controllers/download_controller/download_resource_handler.go
+++ b/controllers/download_controller/download_resource_handler.go
@@ -141,7 +141,11 @@ func downloadResourceWorkFn(request *resource_handler.WorkRequest) interface{} {
 		}
 
 		ctx.Log.Info("Remote media persisted under datastore ", media.DatastoreId, " at ", media.Location)
-		return &workerDownloadResponse{media: media, contentType: media.ContentType}
+		return &workerDownloadResponse{
+			media: media,
+			contentType: media.ContentType,
+			filename: media.UploadName,
+		}
 	}
 
 	if info.blockForMedia {