diff --git a/src/z2ui5_cl_demo_app_339.clas.abap b/src/z2ui5_cl_demo_app_339.clas.abap
index 9b87a50f..8486fe76 100644
--- a/src/z2ui5_cl_demo_app_339.clas.abap
+++ b/src/z2ui5_cl_demo_app_339.clas.abap
@@ -158,7 +158,7 @@ CLASS z2ui5_cl_demo_app_339 IMPLEMENTATION.
 
   METHOD z2ui5_if_app~main.
 
-    IF client->check_on_init( ).
+    IF client->check_on_init( ) OR mt_table IS INITIAL.
 
       get_data( ).
 
diff --git a/src/z2ui5_cl_demo_app_342.clas.abap b/src/z2ui5_cl_demo_app_342.clas.abap
index fc93b167..a2e15954 100644
--- a/src/z2ui5_cl_demo_app_342.clas.abap
+++ b/src/z2ui5_cl_demo_app_342.clas.abap
@@ -159,7 +159,7 @@ CLASS z2ui5_cl_demo_app_342 IMPLEMENTATION.
 
   METHOD z2ui5_if_app~main.
 
-    IF client->check_on_init( ).
+    IF client->check_on_init( ) OR mt_data IS INITIAL.
 
       get_data( ).