diff --git a/src/objects/zcl_abapgit_object_doma.clas.abap b/src/objects/zcl_abapgit_object_doma.clas.abap
index 9282bd455..371d08a7b 100644
--- a/src/objects/zcl_abapgit_object_doma.clas.abap
+++ b/src/objects/zcl_abapgit_object_doma.clas.abap
@@ -155,6 +155,14 @@ CLASS zcl_abapgit_object_doma IMPLEMENTATION.
       WHERE domname = lv_name
       AND ddlanguage <> mv_language.                      "#EC CI_SUBRC
 
+    SELECT DISTINCT ddlanguage AS langu APPENDING TABLE lt_i18n_langs
+      FROM dd07v
+      WHERE domname = lv_name
+      AND ddlanguage <> mv_language.                      "#EC CI_SUBRC
+
+    SORT lt_i18n_langs.
+    DELETE ADJACENT DUPLICATES FROM lt_i18n_langs.
+
     LOOP AT lt_i18n_langs ASSIGNING <lv_lang>.
       lv_index = sy-tabix.
 
@@ -169,11 +177,15 @@ CLASS zcl_abapgit_object_doma IMPLEMENTATION.
         EXCEPTIONS
           illegal_input = 1
           OTHERS        = 2.
-      IF sy-subrc <> 0 OR ls_dd01v-ddlanguage IS INITIAL.
+      IF sy-subrc <> 0.
         DELETE lt_i18n_langs INDEX lv_index. " Don't save this lang
         CONTINUE.
       ENDIF.
 
+      IF ls_dd01v-ddlanguage IS INITIAL.
+        ls_dd01v-ddlanguage = <lv_lang>.
+      ENDIF.
+
       APPEND INITIAL LINE TO lt_dd01_texts ASSIGNING <ls_dd01_text>.
       MOVE-CORRESPONDING ls_dd01v TO <ls_dd01_text>.