diff --git a/src/relationships/index.ts b/src/relationships/index.ts
index 58f5dff7ddd..e6132a7f30b 100644
--- a/src/relationships/index.ts
+++ b/src/relationships/index.ts
@@ -1,4 +1,4 @@
-import type {Id, IdOrNull, Ids} from '../@types/common/index.d.ts';
+import type {Id, IdOrNull, Ids, SortKey} from '../@types/common/index.d.ts';
 import type {
   LinkedRowIdsListener,
   LocalRowIdsListener,
@@ -9,6 +9,7 @@ import type {
   createRelationships as createRelationshipsDecl,
 } from '../@types/relationships/index.d.ts';
 import type {GetCell, Store} from '../@types/store/index.d.ts';
+import {arrayIsEqual} from '../common/array.ts';
 import {
   collDel,
   collForEach,
@@ -105,6 +106,9 @@ export const createRelationships = getCreateFunction(
       remoteTableId: Id,
       getRemoteRowId: Id | ((getCell: GetCell, localRowId: Id) => Id),
     ): Relationships => {
+      mapForEach(mapGet(linkedRowIdsListeners, relationshipId), (firstRowId) =>
+        getLinkedRowIdsCache(relationshipId, firstRowId),
+      );
       mapSet(remoteTableIds, relationshipId, remoteTableId);
 
       setDefinitionAndListen(
@@ -113,6 +117,10 @@ export const createRelationships = getCreateFunction(
         (
           change: () => void,
           changedRemoteRowIds: IdMap<[Id | undefined, Id | undefined]>,
+          _changedSortKeys: IdMap<SortKey>,
+          _rowValues: IdMap<Id | undefined>,
+          _sortKeys?: IdMap<SortKey>,
+          force?: boolean,
         ) => {
           const changedLocalRows: IdSet = setNew();
           const changedRemoteRows: IdSet = setNew();
@@ -163,6 +171,27 @@ export const createRelationships = getCreateFunction(
 
           change();
 
+          if (force) {
+            mapForEach(
+              mapGet(linkedRowIdsListeners, relationshipId),
+              (firstRowId) => {
+                const oldLinkedRowIds = getLinkedRowIds(
+                  relationshipId,
+                  firstRowId,
+                );
+                delLinkedRowIdsCache(relationshipId, firstRowId);
+                if (
+                  !arrayIsEqual(
+                    oldLinkedRowIds,
+                    getLinkedRowIds(relationshipId, firstRowId),
+                  )
+                ) {
+                  setAdd(changedLinkedRows, firstRowId);
+                }
+              },
+            );
+          }
+
           collForEach(changedLocalRows, (localRowId) =>
             callListeners(remoteRowIdListeners, [relationshipId, localRowId]),
           );
diff --git a/test/unit/core/other/relationships.test.ts b/test/unit/core/other/relationships.test.ts
index 697231cbd23..447f0c4479e 100644
--- a/test/unit/core/other/relationships.test.ts
+++ b/test/unit/core/other/relationships.test.ts
@@ -663,6 +663,83 @@ describe('Listens to LocalRowIds when sets', () => {
 });
 
 describe('Linked lists', () => {
+  test('keeps linked listeners working after redefining tables', () => {
+    store.setTable('t1', {r1: {c1: 'r2'}, r2: {c1: 'r3'}});
+    relationships.setRelationshipDefinition('r1', 't1', 't2', 'c1');
+    const changes: string[][] = [];
+    const listener = () =>
+      changes.push(relationships.getLinkedRowIds('r1', 'r1'));
+    const first = relationships.addLinkedRowIdsListener('r1', 'r1', listener);
+    const second = relationships.addLinkedRowIdsListener('r1', 'r1', listener);
+    const unchanged = vi.fn();
+    relationships.addLinkedRowIdsListener('r1', 'missing', unchanged);
+
+    relationships.setRelationshipDefinition('r1', 't1', 't1', 'c1');
+    expect(changes).toEqual([
+      ['r1', 'r2', 'r3'],
+      ['r1', 'r2', 'r3'],
+    ]);
+    expect(unchanged).not.toHaveBeenCalled();
+    changes.length = 0;
+    relationships.setRelationshipDefinition('r1', 't1', 't1', 'c1');
+    expect(changes).toEqual([]);
+    store.setCell('t1', 'r2', 'c1', 'r4');
+    expect(changes).toEqual([
+      ['r1', 'r2', 'r4'],
+      ['r1', 'r2', 'r4'],
+    ]);
+
+    relationships.delListener(first);
+    changes.length = 0;
+    relationships.setRelationshipDefinition('r1', 't1', 't2', 'c1');
+    expect(changes).toEqual([['r1']]);
+    changes.length = 0;
+    relationships.setRelationshipDefinition('r1', 't1', 't1', 'c1');
+    expect(changes).toEqual([['r1', 'r2', 'r4']]);
+    changes.length = 0;
+    store.delRow('t1', 'r2');
+    expect(changes).toEqual([['r1', 'r2']]);
+    expect(unchanged).not.toHaveBeenCalled();
+    relationships.delListener(second);
+    store.setCell('t1', 'r1', 'c1', 'r5');
+    expect(relationships.getLinkedRowIds('r1', 'r1')).toEqual(['r1', 'r5']);
+    relationships.delRelationshipDefinition('r1');
+    expect(relationships.getLinkedRowIds('r1', 'r1')).toEqual(['r1']);
+  });
+
+  test.each([
+    ['t1', 't1', 't1', 't2'],
+    ['t1', 't2', 't1', 't1'],
+    ['t1', 't1', 't2', 't1'],
+    ['t2', 't1', 't1', 't1'],
+    ['t1', 't1', 't1', 't1'],
+    ['t1', 't2', 't1', 't2'],
+  ])(
+    'redefines linked tables from %s/%s to %s/%s',
+    (oldLocal, oldRemote, newLocal, newRemote) => {
+      const table = {r1: {c1: 'r2'}, r2: {c1: 'r3'}};
+      store.setTables({t1: table, t2: table});
+      relationships.setRelationshipDefinition('r1', oldLocal, oldRemote, 'c1');
+      const before = oldLocal == oldRemote ? ['r1', 'r2', 'r3'] : ['r1'];
+      const after = newLocal == newRemote ? ['r1', 'r2', 'r3'] : ['r1'];
+      const listener = vi.fn((current: Relationships) => {
+        expect(current.getLinkedRowIds('r1', 'r1')).toEqual(after);
+      });
+      const listenerId = relationships.addLinkedRowIdsListener(
+        'r1',
+        'r1',
+        listener,
+      );
+      expect(relationships.getLinkedRowIds('r1', 'r1')).toEqual(before);
+      relationships.setRelationshipDefinition('r1', newLocal, newRemote, 'c1');
+      expect(relationships.getLinkedRowIds('r1', 'r1')).toEqual(after);
+      expect(listener).toHaveBeenCalledTimes(
+        before.length == after.length ? 0 : 1,
+      );
+      relationships.delListener(listenerId);
+    },
+  );
+
   const setLinkedCells = (): void => {
     store.setTables({
       t1: {r1: {c1: 'r2'}, r2: {c1: ''}},