diff --git a/backend/src/federation/client/1_0/FederationClient.ts b/backend/src/federation/client/1_0/FederationClient.ts
index 8fd7744e7..e3df5ecf8 100644
--- a/backend/src/federation/client/1_0/FederationClient.ts
+++ b/backend/src/federation/client/1_0/FederationClient.ts
@@ -28,6 +28,10 @@ export class FederationClient {
     })
   }
 
+  getEndpoint = () => {
+    return this.endpoint
+  }
+
   getPublicKey = async (): Promise<string | undefined> => {
     logger.debug('Federation: getPublicKey from endpoint', this.endpoint)
     try {
diff --git a/backend/src/federation/client/FederationClientFactory.ts b/backend/src/federation/client/FederationClientFactory.ts
index d057ffd04..fe2ff0dbd 100644
--- a/backend/src/federation/client/FederationClientFactory.ts
+++ b/backend/src/federation/client/FederationClientFactory.ts
@@ -47,15 +47,25 @@ export class FederationClientFactory {
     const instance = FederationClientFactory.instanceArray.find(
       (instance) => instance.id === dbCom.id,
     )
-    if (instance) {
+    // TODO: found a way to prevent double code with FederationClient::constructor
+    const endpoint = `${dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'}${
+      dbCom.apiVersion
+    }/`
+    // check if endpoint is still the same and not changed meanwhile
+    if (instance && instance.client.getEndpoint() === endpoint) {
       return instance.client
     }
     const client = FederationClientFactory.createFederationClient(dbCom)
     if (client) {
-      FederationClientFactory.instanceArray.push({
-        id: dbCom.id,
-        client,
-      } as FederationClientInstance)
+      // only update instance if we already have one
+      if (instance) {
+        instance.client = client
+      } else {
+        FederationClientFactory.instanceArray.push({
+          id: dbCom.id,
+          client,
+        } as FederationClientInstance)
+      }
     }
     return client
   }