diff --git a/src/components/timeline/TimelineHistogram.svelte b/src/components/timeline/TimelineHistogram.svelte
index 3aa208b0d2..f182dac7c0 100644
--- a/src/components/timeline/TimelineHistogram.svelte
+++ b/src/components/timeline/TimelineHistogram.svelte
@@ -5,6 +5,7 @@
   import type { ScaleTime } from 'd3-scale';
   import { select, type Selection } from 'd3-selection';
   import { zoom as d3Zoom, zoomIdentity, type D3ZoomEvent, type ZoomBehavior, type ZoomTransform } from 'd3-zoom';
+  import { isEmpty } from 'lodash-es';
   import { createEventDispatcher } from 'svelte';
   import type { ActivityDirective } from '../../types/activity';
   import type { ConstraintResult } from '../../types/constraint';
@@ -186,21 +187,23 @@
 
     // Compute constraint violations histogram
     constraintViolationsToRender = [];
-    constraintResults.forEach(constraintResult => {
-      constraintResult.violations.forEach(violation => {
-        violation.windows.forEach(window => {
-          if (xScaleMax !== null) {
-            const xStart = xScaleMax(window.start);
-            const xEnd = xScaleMax(window.end);
-            const clampedStart = xStart < 0 ? 0 : xStart;
-            const clampedEnd = xEnd > drawWidth ? drawWidth : xEnd;
-            const width = clampedEnd - clampedStart;
-            const clampedWidth = width <= 0 ? 5 : width;
-            constraintViolationsToRender.push({ width: clampedWidth, x: clampedStart });
-          }
+    constraintResults
+      .filter(result => !isEmpty(result))
+      .forEach(constraintResult => {
+        constraintResult.violations.forEach(violation => {
+          violation.windows.forEach(window => {
+            if (xScaleMax !== null) {
+              const xStart = xScaleMax(window.start);
+              const xEnd = xScaleMax(window.end);
+              const clampedStart = xStart < 0 ? 0 : xStart;
+              const clampedEnd = xEnd > drawWidth ? drawWidth : xEnd;
+              const width = clampedEnd - clampedStart;
+              const clampedWidth = width <= 0 ? 5 : width;
+              constraintViolationsToRender.push({ width: clampedWidth, x: clampedStart });
+            }
+          });
         });
       });
-    });
   }
 
   $: if (histogramContainer && drawWidth) {
diff --git a/src/components/timeline/Tooltip.svelte b/src/components/timeline/Tooltip.svelte
index 64442fb35f..71afd308fa 100644
--- a/src/components/timeline/Tooltip.svelte
+++ b/src/components/timeline/Tooltip.svelte
@@ -2,8 +2,10 @@
 
 <script lang="ts">
   import { select } from 'd3-selection';
+  import { find } from 'lodash-es';
+  import { constraintResponseMap } from '../../stores/constraints';
   import type { ActivityDirective } from '../../types/activity';
-  import type { ConstraintResult } from '../../types/constraint';
+  import type { ConstraintResponse, ConstraintResult } from '../../types/constraint';
   import type { Span } from '../../types/simulation';
   import type { LinePoint, MouseOver, Point, XRangePoint } from '../../types/timeline';
   import { getDoyTime } from '../../utilities/time';
@@ -186,14 +188,20 @@
   }
 
   function textForConstraintViolation(constraintViolation: ConstraintResult): string {
-    const { constraintName } = constraintViolation;
-    return `
+    const matchResponse: ConstraintResponse = find(
+      Object.values(constraintResponseMap),
+      (response: ConstraintResponse) => response.results === constraintViolation,
+    );
+
+    return matchResponse
+      ? `
       <div>
         Constraint Violation
         <br>
-        Name: ${constraintName}
+        Name: ${matchResponse.constraintName}
       </div>
-    `;
+    `
+      : '';
   }
 
   function textForLinePoint(point: LinePoint): string {