diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/domain/GetNewEventCreationTypeOptions.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/domain/GetNewEventCreationTypeOptions.kt
index 8969821505..7b6148a8fc 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/domain/GetNewEventCreationTypeOptions.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/domain/GetNewEventCreationTypeOptions.kt
@@ -17,11 +17,19 @@ class GetNewEventCreationTypeOptions(
     ): List<EventCreationType> {
         val options: MutableList<EventCreationType> = mutableListOf()
 
+        // EyeSeeTea customization - Not show schedule events when programStage is null
+        // (timeline events view)
+    /*    programStage?.let {
+            if (shouldShowScheduleEvents(it)) {
+                options.add(SCHEDULE)
+            }
+        } ?: options.add(SCHEDULE)*/
+
         programStage?.let {
             if (shouldShowScheduleEvents(it)) {
                 options.add(SCHEDULE)
             }
-        } ?: options.add(SCHEDULE)
+        }
 
         options.add(ADDNEW)
 
diff --git a/dhis2-android-sdk b/dhis2-android-sdk
index 835ba4070f..afc8d608e4 160000
--- a/dhis2-android-sdk
+++ b/dhis2-android-sdk
@@ -1 +1 @@
-Subproject commit 835ba4070f1a34a1d015d11147083642b72fcc3a
+Subproject commit afc8d608e4db47d23b83cb8b487061392d0e5bbb