diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt
index 69f1d7fe39..5946c25002 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt
@@ -537,7 +537,7 @@ class TeiDashboardMobileActivity :
     override fun showMoreOptions(view: View?) {
         val menu: Int = if (enrollmentUid == null) {
             R.menu.dashboard_tei_menu
-        } else if (java.lang.Boolean.TRUE == dashboardViewModel.groupByStage.value) {
+        } else if (dashboardViewModel.groupByStage.value != false) {
             R.menu.dashboard_menu_group
         } else {
             R.menu.dashboard_menu
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt
index 96daf47404..315a1ba54e 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt
@@ -197,7 +197,7 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
                     followUpData = followUpInfoBar,
                     enrollmentData = enrollmentInfoBar,
                     card = card,
-                    isGrouped = groupingEvents ?: false,
+                    isGrouped = groupingEvents ?: true,
                     timelineEventHeaderModel = TimelineEventsHeaderModel(
                         displayEventCreationButton,
                         eventCount,
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/ui/TeiDetailDashboard.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/ui/TeiDetailDashboard.kt
index a903acdde3..e14965afb5 100644
--- a/app/src/main/java/org/dhis2/usescases/teiDashboard/ui/TeiDetailDashboard.kt
+++ b/app/src/main/java/org/dhis2/usescases/teiDashboard/ui/TeiDetailDashboard.kt
@@ -23,7 +23,7 @@ fun TeiDetailDashboard(
     enrollmentData: InfoBarUiModel?,
     card: TeiCardUiModel?,
     timelineEventHeaderModel: TimelineEventsHeaderModel,
-    isGrouped: Boolean = false,
+    isGrouped: Boolean = true,
     timelineOnEventCreationOptionSelected: (EventCreationType) -> Unit,
 ) {
     Column(