diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12e6f136..795b71d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 - Fix nvticache name when for stable version from sources. [#317](https://github.com/greenbone/ospd-openvas/pull/317)
+- Fix stop scan during preferences handling, before spawining OpenVAS. [#332](https://github.com/greenbone/ospd-openvas/pull/332)
 
 [20.8.1]: https://github.com/greenbone/ospd-openvas/compare/v20.8.0...ospd-openvas-20.08
 
diff --git a/ospd_openvas/daemon.py b/ospd_openvas/daemon.py
index 54f19926..71183f19 100644
--- a/ospd_openvas/daemon.py
+++ b/ospd_openvas/daemon.py
@@ -1254,7 +1254,7 @@ def exec_scan(self, scan_id: str):
         # Release memory used for scan preferences.
         del scan_prefs
 
-        if do_not_launch:
+        if do_not_launch or kbdb.scan_is_stopped(openvas_scan_id):
             self.main_db.release_database(kbdb)
             return