diff --git a/src/objects/zcl_abapgit_object_tobj.clas.abap b/src/objects/zcl_abapgit_object_tobj.clas.abap
index 5270d7705..672d84a32 100644
--- a/src/objects/zcl_abapgit_object_tobj.clas.abap
+++ b/src/objects/zcl_abapgit_object_tobj.clas.abap
@@ -33,11 +33,27 @@ CLASS zcl_abapgit_object_tobj IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD update_extra.
+    DATA: lt_current_tvimf TYPE STANDARD TABLE OF tvimf.
+    FIELD-SYMBOLS: <ls_tvimf> TYPE tvimf.
 
     MODIFY tddat FROM is_tobj-tddat.
     MODIFY tvdir FROM is_tobj-tvdir.
-    MODIFY tvimf FROM TABLE is_tobj-tvimf.
 
+    SELECT * INTO TABLE lt_current_tvimf
+      FROM tvimf
+      WHERE tabname = is_tobj-tddat-tabname
+      ORDER BY PRIMARY KEY.
+
+    LOOP AT lt_current_tvimf ASSIGNING <ls_tvimf>.
+      READ TABLE is_tobj-tvimf WITH KEY tabname = <ls_tvimf>-tabname
+                                        event   = <ls_tvimf>-event
+                               TRANSPORTING NO FIELDS.
+      IF sy-subrc <> 0.
+        DELETE tvimf FROM <ls_tvimf>.
+      ENDIF.
+    ENDLOOP.
+
+    MODIFY tvimf FROM TABLE is_tobj-tvimf.
   ENDMETHOD.
 
   METHOD delete_extra.