diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50310686b2..d9c071692e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Lower memory usage when getting a report [#1857](https://github.com/greenbone/gvmd/pull/1857)
 
 ### Fixed
+- Fixed usage of report format %F in generateFilename() [#2021](https://github.com/greenbone/gsa/pull/2021)
 - Fixed report DetailsContent counts in tabs [#2004](https://github.com/greenbone/gsa/pull/2004)
 - Fixed auto_delete_value of 0 for tasks and audits [#1987](https://github.com/greenbone/gsa/pull/1987)
 - Fixed bulk tagging by user selection (send IDs as array) [#1985](https://github.com/greenbone/gsa/pull/1985)
diff --git a/gsa/src/web/pages/reports/deltadetailspage.js b/gsa/src/web/pages/reports/deltadetailspage.js
index 4291c46b82..ff037c1239 100644
--- a/gsa/src/web/pages/reports/deltadetailspage.js
+++ b/gsa/src/web/pages/reports/deltadetailspage.js
@@ -373,7 +373,7 @@ class DeltaReportDetails extends React.Component {
           fileNameFormat: reportExportFileName,
           id: entity.id,
           modificationTime: entity.modificationTime,
-          reportFormat: report_format,
+          reportFormat: report_format.name,
           resourceName: entity.task.name,
           resourceType: 'report',
           username,
diff --git a/gsa/src/web/pages/reports/detailspage.js b/gsa/src/web/pages/reports/detailspage.js
index e21c0f3aca..4c3f4a0715 100644
--- a/gsa/src/web/pages/reports/detailspage.js
+++ b/gsa/src/web/pages/reports/detailspage.js
@@ -435,7 +435,7 @@ class ReportDetails extends React.Component {
           fileNameFormat: reportExportFileName,
           id: entity.id,
           modificationTime: entity.modificationTime,
-          reportFormat: report_format,
+          reportFormat: report_format.name,
           resourceName: entity.task.name,
           resourceType: 'report',
           username,