diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0099b155bd..2f840fbbcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Don't crash target table when port_list is undefined [#3120](https://github.com/greenbone/gsa/pull/3120)
 
-
 [Unreleased]: https://github.com/greenbone/gsa/compare/v21.4.2...gsa-21.04
 
 ## [21.4.2] 2021-08-03
@@ -114,7 +113,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 [21.4.0]: https://github.com/greenbone/gsa/compare/gsa-20.08...v21.4.0
 
-## [20.8.3] (unreleased)
+## [20.8.4] (unreleased)
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+- Fixed setting/displaying timeout in EditNvtDetailsDialog [#3057](https://github.com/greenbone/gsa/pull/3057)
+
+ [Unreleased]: https://github.com/greenbone/gsa/compare/v20.8.3...gsa-20.08
+
+### Fixed
+- Show dead hosts as possible reason in empty report when scan finishes [#3124](https://github.com/greenbone/gsa/pull/3124)
+
+## [20.8.3] 2021-08-03
 ### Added
 ### Changed
 * Changed default Content-Security-Policy (CSP) Header to
@@ -128,7 +140,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Fixed setting/displaying timeout in EditNvtDetailsDialog [#3057](https://github.com/greenbone/gsa/pull/3057)
 
- [Unreleased]: https://github.com/greenbone/gsa/compare/v20.8.2...gsa-20.08
+ [20.8.3]: https://github.com/greenbone/gsa/compare/v20.8.2...v20.8.3
 
 ## [20.8.2] - 2021-06-25
 
diff --git a/gsa/src/web/pages/reports/details/emptyreport.js b/gsa/src/web/pages/reports/details/emptyreport.js
index 8426946baa..39ae7a6717 100644
--- a/gsa/src/web/pages/reports/details/emptyreport.js
+++ b/gsa/src/web/pages/reports/details/emptyreport.js
@@ -53,12 +53,28 @@ const EmptyReport = ({
       />
       <Divider wrap>
         {!isActiveReport && (
-          <ReportPanel
-            icon={props => <TaskIcon {...props} />}
-            title={_('The scan did not collect any results')}
-          >
-            {_('If the scan got interrupted you can try to re-start the task.')}
-          </ReportPanel>
+          <React.Fragment>
+            <ReportPanel
+              icon={props => <TaskIcon {...props} />}
+              title={_('The scan did not collect any results')}
+            >
+              {_(
+                'If the scan got interrupted you can try to re-start the task.',
+              )}
+            </ReportPanel>
+            <ReportPanel
+              icon={props => <TargetIcon {...props} />}
+              title={_('The target hosts could be regarded dead')}
+              onClick={may_edit_target ? onTargetEditClick : undefined}
+            >
+              {_(
+                'You should change the Alive Test Method of the ' +
+                  'target for the next scan. However, if the target hosts ' +
+                  'are indeed dead, the scan duration might increase ' +
+                  'significantly.',
+              )}
+            </ReportPanel>
+          </React.Fragment>
         )}
         {isActiveReport && progress === 1 && (
           <ReportPanel