diff --git a/src/metrics/index.ts b/src/metrics/index.ts
index 2295500007e..92110f2ef5c 100644
--- a/src/metrics/index.ts
+++ b/src/metrics/index.ts
@@ -127,7 +127,11 @@ export const createMetrics = getCreateFunction((store: Store): Metrics => {
   };
 
   const delMetricDefinition = (metricId: Id): Metrics => {
+    const oldMetric = getMetric(metricId);
     delDefinition(metricId);
+    if (!isUndefined(oldMetric) && isUndefined(getMetric(metricId))) {
+      callListeners(metricListeners, [metricId], undefined, oldMetric);
+    }
     return metrics;
   };
 
diff --git a/test/unit/core/other/metrics.test.ts b/test/unit/core/other/metrics.test.ts
index 5c163b177c5..f433b788b12 100644
--- a/test/unit/core/other/metrics.test.ts
+++ b/test/unit/core/other/metrics.test.ts
@@ -626,6 +626,136 @@ describe('Listens to Metrics when sets', () => {
   });
 });
 
+describe('Listens to Metrics when deleting definitions', () => {
+  test.each([0, 5])('notifies with old value %s after removal', (value) => {
+    store.setCell('t1', 'r1', 'c1', value);
+    metrics
+      .setMetricDefinition('m1', 't1', 'max', 'c1')
+      .setMetricDefinition('m2', 't1', 'min', 'c1');
+    const specific = vi.fn((metrics, metricId) => {
+      expect(metrics.getMetric(metricId)).toBeUndefined();
+      expect(metrics.getMetricIds()).toEqual(['m2']);
+      expect(metrics.getTableId(metricId)).toBeUndefined();
+    });
+    const wildcard = vi.fn();
+    const other = vi.fn();
+    const ids = vi.fn();
+    metrics.addMetricListener('m1', specific);
+    metrics.addMetricListener(null, wildcard);
+    metrics.addMetricListener('m2', other);
+    metrics.addMetricIdsListener(ids);
+
+    expect(metrics.delMetricDefinition('m1')).toBe(metrics);
+    expect(specific).toHaveBeenCalledExactlyOnceWith(
+      metrics,
+      'm1',
+      undefined,
+      value,
+    );
+    expect(wildcard).toHaveBeenCalledExactlyOnceWith(
+      metrics,
+      'm1',
+      undefined,
+      value,
+    );
+    expect(other).not.toHaveBeenCalled();
+    expect(ids).toHaveBeenCalledExactlyOnceWith(metrics);
+    expect(metrics.getMetric('m2')).toBe(value);
+    expect(store.getListenerStats().table).toBe(1);
+    expect(store.getListenerStats().row).toBe(1);
+  });
+
+  test('does not notify for absent, empty or repeated deletion', () => {
+    metrics.setMetricDefinition('empty', 't1');
+    const listener = vi.fn();
+    metrics.addMetricListener(null, listener);
+    metrics.delMetricDefinition('absent').delMetricDefinition('empty');
+    expect(listener).not.toHaveBeenCalled();
+    expect(metrics.getMetricIds()).toEqual([]);
+
+    store.setCell('t1', 'r1', 'c1', 5);
+    metrics.setMetricDefinition('m1', 't1', 'max', 'c1');
+    listener.mockClear();
+    metrics.delMetricDefinition('m1').delMetricDefinition('m1');
+    expect(listener).toHaveBeenCalledExactlyOnceWith(
+      metrics,
+      'm1',
+      undefined,
+      5,
+    );
+    expect(store.getListenerStats().table).toBe(0);
+    expect(store.getListenerStats().row).toBe(0);
+  });
+
+  test('retains value subscriptions across deletion and recreation', () => {
+    store.setCell('t1', 'r1', 'c1', 5);
+    metrics.setMetricDefinition('m1', 't1', 'max', 'c1');
+    const listener = vi.fn();
+    const listenerId = metrics.addMetricListener('m1', listener);
+    metrics.delMetricDefinition('m1');
+    store.setCell('t1', 'r1', 'c1', 7);
+    expect(metrics.getMetric('m1')).toBeUndefined();
+    expect(listener).toHaveBeenCalledTimes(1);
+    metrics.setMetricDefinition('m1', 't1', 'max', 'c1');
+    store.setCell('t1', 'r1', 'c1', 9);
+    expect(listener.mock.calls).toEqual([
+      [metrics, 'm1', undefined, 5],
+      [metrics, 'm1', 7, undefined],
+      [metrics, 'm1', 9, 7],
+    ]);
+    expect(metrics.getListenerStats().metric).toBe(1);
+    metrics.delListener(listenerId).delMetricDefinition('m1');
+    expect(listener).toHaveBeenCalledTimes(3);
+    expect(metrics.getListenerStats().metric).toBe(0);
+  });
+
+  test('respects listener removal during the metric IDs notification', () => {
+    store.setCell('t1', 'r1', 'c1', 5);
+    metrics.setMetricDefinition('m1', 't1', 'max', 'c1');
+    const listener = vi.fn();
+    const listenerId = metrics.addMetricListener('m1', listener);
+    metrics.addMetricIdsListener(() => metrics.delListener(listenerId));
+    metrics.delMetricDefinition('m1');
+    expect(listener).not.toHaveBeenCalled();
+    expect(metrics.getListenerStats().metric).toBe(0);
+  });
+
+  test('does not report stale removal after an IDs listener recreates', () => {
+    store.setRow('t1', 'r1', {c1: 5, c2: 7});
+    metrics.setMetricDefinition('m1', 't1', 'max', 'c1');
+    const listener = vi.fn();
+    metrics.addMetricListener('m1', listener);
+    const listenerId = metrics.addMetricIdsListener(() => {
+      metrics.delListener(listenerId);
+      metrics.setMetricDefinition('m1', 't1', 'max', 'c2');
+    });
+    metrics.delMetricDefinition('m1');
+    expect(metrics.getMetric('m1')).toBe(7);
+    expect(listener).toHaveBeenCalledExactlyOnceWith(
+      metrics,
+      'm1',
+      7,
+      undefined,
+    );
+    expect(store.getListenerStats().table).toBe(1);
+    expect(store.getListenerStats().row).toBe(1);
+  });
+
+  test('preserves definition overwrite notifications', () => {
+    store.setTable('t1', {r1: {c1: 5}, r2: {c1: 7}});
+    metrics.setMetricDefinition('m1', 't1', 'max', 'c1');
+    const listener = vi.fn();
+    metrics.addMetricListener('m1', listener);
+    metrics
+      .setMetricDefinition('m1', 't1', 'max', 'c1')
+      .setMetricDefinition('m1', 't1', 'min', 'c1');
+    expect(listener).toHaveBeenCalledExactlyOnceWith(metrics, 'm1', 5, 7);
+    metrics.delMetricDefinition('m1');
+    expect(listener).toHaveBeenLastCalledWith(metrics, 'm1', undefined, 5);
+    expect(listener).toHaveBeenCalledTimes(2);
+  });
+});
+
 describe('Miscellaneous', () => {
   test('Listener cannot mutate original store', () => {
     const listener = vi.fn(() => {
diff --git a/test/unit/core/ui-react/components.test.tsx b/test/unit/core/ui-react/components.test.tsx
index 935af32c621..55f8cad0342 100644
--- a/test/unit/core/ui-react/components.test.tsx
+++ b/test/unit/core/ui-react/components.test.tsx
@@ -11,7 +11,7 @@ import type {
   Relationships,
   Store,
 } from 'tinybase';
-import {createStore} from 'tinybase';
+import {createMetrics, createStore} from 'tinybase';
 import type {AnyPersister} from 'tinybase/persisters';
 import type {Synchronizer} from 'tinybase/synchronizers';
 import type {
@@ -956,3 +956,36 @@ test('ignores stale cleanup for a missing provider registration', () => {
   expect(container.textContent).toBe('[]');
   unmount();
 });
+
+test('MetricView follows metric deletion and recreation', async () => {
+  const store = createStore().setTable('pets', {fido: {price: 5}});
+  const metrics = createMetrics(store).setMetricDefinition(
+    'highestPrice',
+    'pets',
+    'max',
+    'price',
+  );
+  const {container, unmount} = componentHarness.render(MetricView, {
+    metricId: 'highestPrice',
+    metrics,
+  });
+  expect(container.textContent).toBe('5');
+
+  await componentHarness.act(() => metrics.delMetricDefinition('other'));
+  expect(container.textContent).toBe('5');
+  await componentHarness.act(() => metrics.delMetricDefinition('highestPrice'));
+  expect(metrics.getMetric('highestPrice')).toBeUndefined();
+  expect(container.textContent).toBe('');
+  await componentHarness.act(() => store.setCell('pets', 'fido', 'price', 7));
+  expect(container.textContent).toBe('');
+  await componentHarness.act(() =>
+    metrics.setMetricDefinition('highestPrice', 'pets', 'max', 'price'),
+  );
+  expect(container.textContent).toBe('7');
+  await componentHarness.act(() => store.delTable('pets'));
+  expect(container.textContent).toBe('');
+  await componentHarness.act(() => store.setCell('pets', 'fido', 'price', 9));
+  expect(container.textContent).toBe('9');
+  unmount();
+  expect(metrics.getListenerStats().metric).toBe(0);
+});