diff --git a/src/ui/zcl_abapgit_gui_page_boverview.clas.abap b/src/ui/zcl_abapgit_gui_page_boverview.clas.abap
index 60fab83b2..c77b8599a 100644
--- a/src/ui/zcl_abapgit_gui_page_boverview.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_boverview.clas.abap
@@ -120,12 +120,16 @@ CLASS zcl_abapgit_gui_page_boverview IMPLEMENTATION.
     LOOP AT mt_commits ASSIGNING <ls_commit>.
 
       IF sy-tabix = 1.
-* assumption: all branches are created from master, todo
+        " assumption: all branches are created from master, todo
         ro_html->add( |var {
           escape_branch( <ls_commit>-branch ) } = gitgraph.branch("{
           <ls_commit>-branch }");| ).
       ENDIF.
 
+      IF <ls_commit>-branch IS INITIAL.
+        CONTINUE. " we skip orphaned commits
+      ENDIF.
+
       IF <ls_commit>-compressed = abap_true.
         ro_html->add( |{ escape_branch( <ls_commit>-branch ) }.commit(\{message: "{
           escape_message( <ls_commit>-message )