diff --git a/src/objects/tabl/zcl_abapgit_object_tabl.clas.abap b/src/objects/tabl/zcl_abapgit_object_tabl.clas.abap
index 7e6b48ca8..321331d10 100644
--- a/src/objects/tabl/zcl_abapgit_object_tabl.clas.abap
+++ b/src/objects/tabl/zcl_abapgit_object_tabl.clas.abap
@@ -84,7 +84,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_object_tabl IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_OBJECT_TABL IMPLEMENTATION.
 
 
   METHOD clear_dd03p_fields.
@@ -983,6 +983,15 @@ CLASS zcl_abapgit_object_tabl IMPLEMENTATION.
              <ls_dd12v>-as4date,
              <ls_dd12v>-as4time,
              <ls_dd12v>-dbindex.
+      IF <ls_dd12v>-dbstate IS INITIAL OR <ls_dd12v>-dbstate = 'O'.
+        " These settings are only relevant if database-specific indexes are defined (dbstate = 'D')
+        CLEAR:
+          <ls_dd12v>-dbinclexcl,
+          <ls_dd12v>-dbsyssel1,
+          <ls_dd12v>-dbsyssel2,
+          <ls_dd12v>-dbsyssel3,
+          <ls_dd12v>-dbsyssel4.
+      ENDIF.
     ENDLOOP.
 
     clear_dd03p_fields( CHANGING ct_dd03p = ls_internal-dd03p ).