diff --git a/settings/Controller/LogSettingsController.php b/settings/Controller/LogSettingsController.php
index 4863c2369b..f9a69fa38c 100644
--- a/settings/Controller/LogSettingsController.php
+++ b/settings/Controller/LogSettingsController.php
@@ -105,6 +105,7 @@ class LogSettingsController extends Controller {
 	 */
 	public function download() {
 		$resp = new StreamResponse(\OC\Log\Owncloud::getLogFilePath());
+		$resp->addHeader('Content-Type', 'application/octet-stream');
 		$resp->addHeader('Content-Disposition', 'attachment; filename="owncloud.log"');
 		return $resp;
 	}
diff --git a/tests/Settings/Controller/LogSettingsControllerTest.php b/tests/Settings/Controller/LogSettingsControllerTest.php
index 092c04aecc..1660369faf 100644
--- a/tests/Settings/Controller/LogSettingsControllerTest.php
+++ b/tests/Settings/Controller/LogSettingsControllerTest.php
@@ -71,5 +71,8 @@ class LogSettingsControllerTest extends \Test\TestCase {
 		$response = $this->logSettingsController->download();
 
 		$this->assertInstanceOf('\OCP\AppFramework\Http\StreamResponse', $response);
+		$headers = $response->getHeaders();
+		$this->assertEquals('application/octet-stream', $headers['Content-Type']);
+		$this->assertEquals('attachment; filename="owncloud.log"', $headers['Content-Disposition']);
 	}
 }