diff --git a/docs/en_US/release_notes_6_3.rst b/docs/en_US/release_notes_6_3.rst
index d4a55568b..65152f028 100644
--- a/docs/en_US/release_notes_6_3.rst
+++ b/docs/en_US/release_notes_6_3.rst
@@ -25,5 +25,6 @@ Bug fixes
 | `Issue #6964 <https://redmine.postgresql.org/issues/6964>`_ -  Fixed an issue where properties of the database should not be visible after removing the database.
 | `Issue #6986 <https://redmine.postgresql.org/issues/6986>`_ -  Fixed an issue where the user can't debug function with timestamp parameter.
 | `Issue #6989 <https://redmine.postgresql.org/issues/6989>`_ -  Fixed an issue where the Change Password menu option is missing for internal authentication source when more than one authentication source is defined.
+| `Issue #7005 <https://redmine.postgresql.org/issues/7005>`_ -  Fixed an issue where On-demand rows throw an error when any row cell is edited and saved it then scroll to get more rows.
 | `Issue #7006 <https://redmine.postgresql.org/issues/7006>`_ -  Ensure that Python 3.10 and the latest eventlet dependency should not break the application.
 | `Issue #7013 <https://redmine.postgresql.org/issues/7013>`_ -  Fix an RPM build issue that could lead to a conflict with python3 at installation.
diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py
index 045c01bfd..ef0994ee3 100644
--- a/web/pgadmin/tools/sqleditor/__init__.py
+++ b/web/pgadmin/tools/sqleditor/__init__.py
@@ -560,7 +560,7 @@ def fetch(trans_id, fetch_all=None):
             status = 'Error'
         else:
             status = 'Success'
-            res_len = len(result)
+            res_len = len(result) if result else 0
             if fetch_row_cnt != -1 and res_len == ON_DEMAND_RECORD_COUNT:
                 has_more_rows = True
 
diff --git a/web/pgadmin/utils/driver/psycopg2/connection.py b/web/pgadmin/utils/driver/psycopg2/connection.py
index a2d1a873d..535166bae 100644
--- a/web/pgadmin/utils/driver/psycopg2/connection.py
+++ b/web/pgadmin/utils/driver/psycopg2/connection.py
@@ -1113,7 +1113,6 @@ WHERE db.datname = current_database()""")
             formatted exception message
         """
         status, cur = self.__cursor()
-        self.row_count = 0
 
         if not status:
             return False, str(cur)
@@ -1164,8 +1163,6 @@ WHERE db.datname = current_database()""")
             )
             return False, errmsg
 
-        self.row_count = cur.rowcount
-
         return True, None
 
     def __attempt_execution_reconnect(self, fn, *args, **kwargs):