diff --git a/src/libs/av/impl/TranscodeResourceHandler.cpp b/src/libs/av/impl/TranscodeResourceHandler.cpp
index 5e85b72e..6535f806 100644
--- a/src/libs/av/impl/TranscodeResourceHandler.cpp
+++ b/src/libs/av/impl/TranscodeResourceHandler.cpp
@@ -56,6 +56,7 @@ namespace Av
 		if (_estimatedContentLength)
 			response.setContentLength(*_estimatedContentLength);
 		response.setMimeType(_transcoder.getOutputMimeType());
+		LMS_LOG(TRANSCODE, DEBUG) << "Set mime type to " << _transcoder.getOutputMimeType();
 
 		if (_bytesReadyCount > 0)
 		{
diff --git a/src/lms/ui/resource/AudioFileResource.cpp b/src/lms/ui/resource/AudioFileResource.cpp
index 792128c0..e7a8809b 100644
--- a/src/lms/ui/resource/AudioFileResource.cpp
+++ b/src/lms/ui/resource/AudioFileResource.cpp
@@ -95,6 +95,15 @@ AudioFileResource::handleRequest(const Wt::Http::Request& request,
 			return;
 
 		fileResourceHandler = createFileResourceHandler(*trackPath);
+
+		const auto guessedAudioFormat {Av::guessAudioFileFormat(*trackPath)};
+		if (guessedAudioFormat)
+		{
+			LOG(DEBUG) << "Set mime type to " << guessedAudioFormat->mimeType;
+			response.setMimeType(guessedAudioFormat->mimeType);
+		}
+		else
+			response.setMimeType("application/octet-stream");
 	}
 	else
 	{
diff --git a/src/lms/ui/resource/AudioFileResource.hpp b/src/lms/ui/resource/AudioFileResource.hpp
index 589ac51e..777d0639 100644
--- a/src/lms/ui/resource/AudioFileResource.hpp
+++ b/src/lms/ui/resource/AudioFileResource.hpp
@@ -33,8 +33,6 @@ namespace UserInterface
 			std::string getUrl(Database::TrackId trackId) const;
 
 		private:
-			static constexpr std::size_t _chunkSize {262144};
-
 			void handleRequest(const Wt::Http::Request& request,
 					Wt::Http::Response& response) override;
 	};