1 files changed, 21 insertions, 22 deletions
diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index fe7bfe6ed..eacfa5506 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -66,9 +66,9 @@ export class LinkManager {
         const watchUserLinkDB = (userLinkDBDoc: Doc) => {
             LinkManager.links.push(...DocListCast(userLinkDBDoc.data));
             const toRealField = (field: Field) => (field instanceof ProxyField ? field.value() : field); // see List.ts.  data structure is not a simple list of Docs, but a list of ProxyField/Fields
-            const observeLinkDB = (linkDB: List<Doc>) =>
+            if (userLinkDBDoc.data) {
                 observe(
-                    linkDB,
+                    userLinkDBDoc.data,
                     change => {
                         // observe pushes/splices on a user link DB 'data' field (should only happen for local changes)
                         switch (change.type as any) {
@@ -81,27 +81,26 @@ export class LinkManager {
                     },
                     true
                 );
-            if (userLinkDBDoc.data) observeLinkDB(userLinkDBDoc.data as List<Doc>);
-            observe(
-                userLinkDBDoc,
-                'data', // obsever when a new array of links is assigned as the link DB 'data' field (should happen whenever a remote user adds/removes a link)
-                change => {
-                    switch (change.type as any) {
-                        case 'update':
-                            if (!change.oldValue) observeLinkDB(change.newValue as List<Doc>);
-                            Promise.all([...((change.oldValue as any as Doc[]) || []), ...((change.newValue as any as Doc[]) || [])]).then(doclist => {
-                                const oldDocs = doclist.slice(0, ((change.oldValue as any as Doc[]) || []).length);
-                                const newDocs = doclist.slice(((change.oldValue as any as Doc[]) || []).length, doclist.length);
+                observe(
+                    userLinkDBDoc,
+                    'data', // obsever when a new array of links is assigned as the link DB 'data' field (should happen whenever a remote user adds/removes a link)
+                    change => {
+                        switch (change.type as any) {
+                            case 'update':
+                                Promise.all([...((change.oldValue as any as Doc[]) || []), ...((change.newValue as any as Doc[]) || [])]).then(doclist => {
+                                    const oldDocs = doclist.slice(0, ((change.oldValue as any as Doc[]) || []).length);
+                                    const newDocs = doclist.slice(((change.oldValue as any as Doc[]) || []).length, doclist.length);
 
-                                const added = newDocs?.filter(link => !(oldDocs || []).includes(link));
-                                const removed = oldDocs?.filter(link => !(newDocs || []).includes(link));
-                                added?.forEach((link: any) => addLinkToDoc(toRealField(link)));
-                                removed?.forEach((link: any) => remLinkFromDoc(toRealField(link)));
-                            });
-                    }
-                },
-                true
-            );
+                                    const added = newDocs?.filter(link => !(oldDocs || []).includes(link));
+                                    const removed = oldDocs?.filter(link => !(newDocs || []).includes(link));
+                                    added?.forEach((link: any) => addLinkToDoc(toRealField(link)));
+                                    removed?.forEach((link: any) => remLinkFromDoc(toRealField(link)));
+                                });
+                        }
+                    },
+                    true
+                );
+            }
         };
         observe(
             LinkManager.userLinkDBs,