diff --git a/src/repo/zcl_abapgit_repo.clas.abap b/src/repo/zcl_abapgit_repo.clas.abap
index 3c952b3f9..578e5eff1 100644
--- a/src/repo/zcl_abapgit_repo.clas.abap
+++ b/src/repo/zcl_abapgit_repo.clas.abap
@@ -312,9 +312,7 @@ CLASS zcl_abapgit_repo IMPLEMENTATION.
     ENDIF.
 
     CREATE OBJECT ri_config TYPE zcl_abapgit_data_config.
-    mi_data_config = ri_config.
 
-    " Assume remote data has been loaded already
     READ TABLE mt_remote ASSIGNING <ls_remote>
       WITH KEY file_path
       COMPONENTS path = zif_abapgit_data_config=>c_default_path.
@@ -322,6 +320,12 @@ CLASS zcl_abapgit_repo IMPLEMENTATION.
       ri_config->from_json( mt_remote ).
     ENDIF.
 
+* offline repos does not have the remote files before the zip is choosen
+* so make sure the json is read after zip file is loaded
+    IF lines( mt_remote ) > 0.
+      mi_data_config = ri_config.
+    ENDIF.
+
   ENDMETHOD.