diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e506e031..10677dee7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Check db version before creating SQL functions [#1304](https://github.com/greenbone/gvmd/pull/1304)
 - Fix severity_in_level SQL function [#1312](https://github.com/greenbone/gvmd/pull/1312)
 - Fix and simplify SecInfo migration [#1331](https://github.com/greenbone/gvmd/pull/1331)
+- Prevent CPE/NVD_ID from being "(null)" [#1369](https://github.com/greenbone/gvmd/pull/1369)
 
 ### Removed
 - Remove solution element from VT tags [#886](https://github.com/greenbone/gvmd/pull/886)
diff --git a/src/gmp.c b/src/gmp.c
index 4ce0e484d..a84f06a5e 100644
--- a/src/gmp.c
+++ b/src/gmp.c
@@ -13259,11 +13259,14 @@ handle_get_info (gmp_parser_t *gmp_parser, GError **error)
                              "<score>%d</score>"
                              "<cve_refs>%s</cve_refs>"
                              "<status>%s</status>",
-                             cpe_info_iterator_nvd_id (&info),
+                             cpe_info_iterator_nvd_id (&info)
+                              ? cpe_info_iterator_nvd_id (&info)
+                              : "",
                              cpe_info_iterator_score (&info),
                              cpe_info_iterator_cve_refs (&info),
-                             cpe_info_iterator_status (&info) ?
-                             cpe_info_iterator_status (&info) : "");
+                             cpe_info_iterator_status (&info)
+                              ? cpe_info_iterator_status (&info)
+                              : "");
 
           if (get_info_data->details == 1)
             {