diff --git a/crates/viewer/re_time_panel/src/data_density_graph.rs b/crates/viewer/re_time_panel/src/data_density_graph.rs
index 1bf87e99d45e8..8300e7cffc5eb 100644
--- a/crates/viewer/re_time_panel/src/data_density_graph.rs
+++ b/crates/viewer/re_time_panel/src/data_density_graph.rs
@@ -384,6 +384,7 @@ pub fn data_density_graph_ui(
     time_ranges_ui: &TimeRangesUi,
     row_rect: Rect,
     item: &TimePanelItem,
+    tooltips_enabled: bool,
 ) {
     re_tracing::profile_function!();
 
@@ -410,20 +411,22 @@ pub fn data_density_graph_ui(
         0f32..=0f32,
     );
 
-    if let Some(hovered_time) = data.hovered_time {
-        ctx.selection_state().set_hovered(item.to_item());
-
-        if ui.ctx().dragged_id().is_none() {
-            // TODO(jprochazk): check chunk.num_rows() and chunk.timeline.is_sorted()
-            //                  if too many rows and unsorted, show some generic error tooltip (=too much data)
-            egui::show_tooltip_at_pointer(
-                ui.ctx(),
-                ui.layer_id(),
-                egui::Id::new("data_tooltip"),
-                |ui| {
-                    show_row_ids_tooltip(ctx, ui, time_ctrl, db, item, hovered_time);
-                },
-            );
+    if tooltips_enabled {
+        if let Some(hovered_time) = data.hovered_time {
+            ctx.selection_state().set_hovered(item.to_item());
+
+            if ui.ctx().dragged_id().is_none() {
+                // TODO(jprochazk): check chunk.num_rows() and chunk.timeline.is_sorted()
+                //                  if too many rows and unsorted, show some generic error tooltip (=too much data)
+                egui::show_tooltip_at_pointer(
+                    ui.ctx(),
+                    ui.layer_id(),
+                    egui::Id::new("data_tooltip"),
+                    |ui| {
+                        show_row_ids_tooltip(ctx, ui, time_ctrl, db, item, hovered_time);
+                    },
+                );
+            }
         }
     }
 }
diff --git a/crates/viewer/re_time_panel/src/lib.rs b/crates/viewer/re_time_panel/src/lib.rs
index cb0217c4a3801..45012d18ccb1a 100644
--- a/crates/viewer/re_time_panel/src/lib.rs
+++ b/crates/viewer/re_time_panel/src/lib.rs
@@ -734,6 +734,7 @@ impl TimePanel {
                     &self.time_ranges_ui,
                     row_rect,
                     &item,
+                    true,
                 );
             }
         }
@@ -909,6 +910,7 @@ impl TimePanel {
                         &self.time_ranges_ui,
                         row_rect,
                         &item,
+                        true,
                     );
                 }
             }
@@ -1051,6 +1053,7 @@ fn collapsed_time_marker_and_time(
                 &time_ranges_ui,
                 time_range_rect.shrink2(egui::vec2(0.0, 10.0)),
                 &TimePanelItem::entity_path(EntityPath::root()),
+                false,
             );
 
             time_marker_ui(