diff --git a/frontend-modern/src/components/Infrastructure/InfrastructureSummary.test.tsx b/frontend-modern/src/components/Infrastructure/InfrastructureSummary.test.tsx
index e7c03a758..de7552aaa 100644
--- a/frontend-modern/src/components/Infrastructure/InfrastructureSummary.test.tsx
+++ b/frontend-modern/src/components/Infrastructure/InfrastructureSummary.test.tsx
@@ -285,7 +285,7 @@ describe('InfrastructureSummary range behavior', () => {
 
     await waitFor(() => {
       expect(container.querySelector('svg.cursor-crosshair')).toBeNull();
-      expect(container.textContent).toContain('Waiting for first sample');
+      expect(container.textContent).toContain('Gathering first sample…');
     });
   });
 
@@ -310,7 +310,7 @@ describe('InfrastructureSummary range behavior', () => {
     });
 
     await waitFor(() => {
-      expect(container.textContent).toContain('Waiting for first sample');
+      expect(container.textContent).toContain('Gathering first sample…');
     });
   });
 
@@ -620,7 +620,7 @@ describe('InfrastructureSummary range behavior', () => {
     });
 
     await waitFor(() => {
-      expect(container.textContent).not.toContain('No history yet');
+      expect(container.textContent).not.toContain('Building trend history…');
     });
   });
 
diff --git a/frontend-modern/src/components/Infrastructure/__tests__/UnifiedResourceTable.performance.contract.test.tsx b/frontend-modern/src/components/Infrastructure/__tests__/UnifiedResourceTable.performance.contract.test.tsx
index b6015b7cf..9d9ed807d 100644
--- a/frontend-modern/src/components/Infrastructure/__tests__/UnifiedResourceTable.performance.contract.test.tsx
+++ b/frontend-modern/src/components/Infrastructure/__tests__/UnifiedResourceTable.performance.contract.test.tsx
@@ -289,7 +289,7 @@ describe('UnifiedResourceTable performance contract', () => {
         "displaySeries().map((series) => ({",
       );
       expect(infrastructureSummaryStateSource).not.toContain(
-        "isAwaitingFirstSample() ? 'Waiting for first sample' : 'No history yet'",
+        "isAwaitingFirstSample() ? 'Gathering first sample…' : 'Building trend history…'",
       );
       expect(infrastructureSummaryStateSource).not.toContain("fetchFailed() ? 'Trend data unavailable' : emptyHistoryLabel()");
       expect(infrastructureSummaryModelSource).toContain(
diff --git a/frontend-modern/src/components/Infrastructure/__tests__/infrastructureSummaryModel.test.ts b/frontend-modern/src/components/Infrastructure/__tests__/infrastructureSummaryModel.test.ts
index 0d40d4e9e..a8e0302d8 100644
--- a/frontend-modern/src/components/Infrastructure/__tests__/infrastructureSummaryModel.test.ts
+++ b/frontend-modern/src/components/Infrastructure/__tests__/infrastructureSummaryModel.test.ts
@@ -157,10 +157,10 @@ describe('infrastructureSummaryModel', () => {
     ]);
     expect(hasInfrastructureSeriesData(series, 'network')).toBe(true);
     expect(hasInfrastructureSeriesData(series, 'diskio')).toBe(false);
-    expect(buildInfrastructureEmptyHistoryLabel(true)).toBe('Waiting for first sample');
-    expect(buildInfrastructureEmptyHistoryLabel(false)).toBe('No history yet');
-    expect(buildInfrastructureEmptyMessage(true, 'No history yet')).toBe('Trend data unavailable');
-    expect(buildInfrastructureEmptyMessage(false, 'No history yet')).toBe('No history yet');
+    expect(buildInfrastructureEmptyHistoryLabel(true)).toBe('Gathering first sample…');
+    expect(buildInfrastructureEmptyHistoryLabel(false)).toBe('Building trend history…');
+    expect(buildInfrastructureEmptyMessage(true, 'Building trend history…')).toBe('Trend data unavailable');
+    expect(buildInfrastructureEmptyMessage(false, 'Building trend history…')).toBe('Building trend history…');
   });
 
   it('keeps network and diskio series on canonical ids when focused summary selection narrows the view', () => {
diff --git a/frontend-modern/src/components/Infrastructure/infrastructureSummaryModel.ts b/frontend-modern/src/components/Infrastructure/infrastructureSummaryModel.ts
index 77d0e2704..2d356a32c 100644
--- a/frontend-modern/src/components/Infrastructure/infrastructureSummaryModel.ts
+++ b/frontend-modern/src/components/Infrastructure/infrastructureSummaryModel.ts
@@ -281,7 +281,7 @@ export function isInfrastructureAwaitingFirstSample(options: {
 }
 
 export function buildInfrastructureEmptyHistoryLabel(isAwaitingFirstSample: boolean): string {
-  return isAwaitingFirstSample ? 'Waiting for first sample' : 'No history yet';
+  return isAwaitingFirstSample ? 'Gathering first sample…' : 'Building trend history…';
 }
 
 export function buildInfrastructureEmptyMessage(
diff --git a/frontend-modern/src/features/dashboardOverview/__tests__/TrendCharts.test.tsx b/frontend-modern/src/features/dashboardOverview/__tests__/TrendCharts.test.tsx
index d4eb04435..371db1704 100644
--- a/frontend-modern/src/features/dashboardOverview/__tests__/TrendCharts.test.tsx
+++ b/frontend-modern/src/features/dashboardOverview/__tests__/TrendCharts.test.tsx
@@ -65,7 +65,7 @@ describe('TrendCharts', () => {
           infrastructure: {
             cpu: new Map(),
             memory: new Map(),
-            emptyMessage: 'Waiting for first sample',
+            emptyMessage: 'Gathering first sample…',
           },
         })}
         overview={makeOverview()}
@@ -74,6 +74,6 @@ describe('TrendCharts', () => {
       />
     ));
 
-    expect(screen.getByText('Waiting for first sample')).toBeTruthy();
+    expect(screen.getByText('Gathering first sample…')).toBeTruthy();
   });
 });
diff --git a/frontend-modern/src/utils/__tests__/frontendResourceTypeBoundaries.test.ts b/frontend-modern/src/utils/__tests__/frontendResourceTypeBoundaries.test.ts
index 180bdf3ce..dc50ab24e 100644
--- a/frontend-modern/src/utils/__tests__/frontendResourceTypeBoundaries.test.ts
+++ b/frontend-modern/src/utils/__tests__/frontendResourceTypeBoundaries.test.ts
@@ -978,7 +978,7 @@ describe('frontend resource type boundaries', () => {
     );
     expect(infrastructureSummaryStateSource).not.toContain("displaySeries().map((series) => ({");
     expect(infrastructureSummaryStateSource).not.toContain(
-      "isAwaitingFirstSample() ? 'Waiting for first sample' : 'No history yet'",
+      "isAwaitingFirstSample() ? 'Gathering first sample…' : 'Building trend history…'",
     );
     expect(infrastructureSummaryStateSource).not.toContain("getOrgID() || 'default'");
     expect(storageSummaryCacheSource).toContain('normalizeOrgScope(getOrgID())');