diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00c2e3f240e1d37d214b5ef4844040b3d0d6c5ce..6277428be0099e2b3dbd26903327265e345aec2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 * Fixed the Synapse import script to not skip duplicated media. Thanks @jaywink!
 * Fixed requests to IPv6 hosts. Thanks @MatMaul!
 * Removed excessive calls to the database during upload.
+* Fixed empty Content-Type header on retrieved remote media.
 
 ## [1.1.2] - April 21st, 2020
 
diff --git a/controllers/download_controller/download_resource_handler.go b/controllers/download_controller/download_resource_handler.go
index d0ecd7ffd4054e5003d12d0e13af80c5a808bcab..b875e2fbc187d7aefe428b722086f0263bf9ca21 100644
--- a/controllers/download_controller/download_resource_handler.go
+++ b/controllers/download_controller/download_resource_handler.go
@@ -141,7 +141,7 @@ func downloadResourceWorkFn(request *resource_handler.WorkRequest) interface{} {
 		}
 
 		ctx.Log.Info("Remote media persisted under datastore ", media.DatastoreId, " at ", media.Location)
-		return &workerDownloadResponse{media: media}
+		return &workerDownloadResponse{media: media, contentType: media.ContentType}
 	}
 
 	if info.blockForMedia {