diff --git a/backend/src/federation/client/Client_1_0.ts b/backend/src/federation/client/Client_1_0.ts
index b0fb825ee..df239db92 100644
--- a/backend/src/federation/client/Client_1_0.ts
+++ b/backend/src/federation/client/Client_1_0.ts
@@ -27,14 +27,10 @@ export class Client_1_0 {
 
   getPublicKey = async (): Promise<string | undefined> => {
     logger.info(`requestGetPublicKey with endpoint='${this.endpoint}'...`)
-
-    const variables = {}
-
     try {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const { data, errors, headers, status } = await this.client.rawRequest(
-        getPublicKey,
-        variables,
+        getPublicKey
       )
       logger.debug(`Response-Data:`, data, errors, headers, status)
       if (data) {
diff --git a/federation/src/server/plugins.ts b/federation/src/server/plugins.ts
index 541c68ca2..38fdfbe9f 100644
--- a/federation/src/server/plugins.ts
+++ b/federation/src/server/plugins.ts
@@ -23,8 +23,8 @@ const setHeadersPlugin = {
 
 const filterVariables = (variables: any) => {
   const vars = clonedeep(variables)
-  if (vars.password) vars.password = '***'
-  if (vars.passwordNew) vars.passwordNew = '***'
+  if (vars && vars.password) vars.password = '***'
+  if (vars && vars.passwordNew) vars.passwordNew = '***'
   return vars
 }