diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f55b1a85..54a148bbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -100,6 +100,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix handling of termination signals [#1034](https://github.com/greenbone/gvmd/pull/1034)
 - Remove db init warning that no longer makes sense [#1044](https://github.com/greenbone/gvmd/pull/1044)
 - Use correct elements to get task ID in wizards [#1004](https://github.com/greenbone/gvmd/pull/1004) [#1046](https://github.com/greenbone/gvmd/pull/1046)
+- Use current row for iterator_null, instead of first row [#1047](https://github.com/greenbone/gvmd/pull/1047)
 
 ### Removed
 - Remove support for "All SecInfo": removal of "allinfo" for type in get_info [#790](https://github.com/greenbone/gvmd/pull/790)
diff --git a/src/sql_pg.c b/src/sql_pg.c
index b1f909fca..2483fcee2 100644
--- a/src/sql_pg.c
+++ b/src/sql_pg.c
@@ -636,7 +636,7 @@ iterator_null (iterator_t* iterator, int col)
 {
   if (iterator->done) abort ();
   assert (iterator->stmt->result);
-  return PQgetisnull (iterator->stmt->result, 0, col);
+  return PQgetisnull (iterator->stmt->result, iterator->stmt->current_row, col);
 }
 
 /**