diff --git a/core/src/filed/filed_conf.cc b/core/src/filed/filed_conf.cc
index b8a5eb69aca..c2999f048bc 100644
--- a/core/src/filed/filed_conf.cc
+++ b/core/src/filed/filed_conf.cc
@@ -251,6 +251,22 @@ static void ParseConfigCb(LEX *lc, ResourceItem *item, int index, int pass)
    }
 }
 
+bool GetTlsPskByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value)
+{
+//   char *fq_name_buffer = bstrdup(fq_name_);
+//   UnbashSpaces(fq_name_buffer);
+//   std::string fq_name(fq_name_buffer);
+//   free(fq_name_buffer);
+
+   return false;
+}
+
+static void ConfigInitLateCb(ConfigurationParser &my_config)
+{
+  ClientResource *client_resource = (ClientResource *)GetNextRes(R_CLIENT, NULL);
+  client_resource->tls_psk.GetTlsPskByFullyQualifiedResourceNameCb = GetTlsPskByFullyQualifiedResourceName;
+}
+
 ConfigurationParser *InitFdConfig(const char *configfile, int exit_code)
 {
    return new ConfigurationParser (
@@ -268,7 +284,8 @@ ConfigurationParser *InitFdConfig(const char *configfile, int exit_code)
                 resources,
                 res_head,
                 default_config_filename.c_str(),
-                "bareos-fd.d");
+                "bareos-fd.d",
+                ConfigInitLateCb);
 }
 
 /**
@@ -312,16 +329,6 @@ bool PrintConfigSchemaJson(PoolMem &buffer)
 }
 #endif
 
-bool GetTlsPskByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value)
-{
-//   char *fq_name_buffer = bstrdup(fq_name_);
-//   UnbashSpaces(fq_name_buffer);
-//   std::string fq_name(fq_name_buffer);
-//   free(fq_name_buffer);
-
-   return false;
-}
-
 /* **************************************************************************** */
 } /* namespace filedaemon */
 /* **************************************************************************** */
diff --git a/core/src/stored/stored_conf.cc b/core/src/stored/stored_conf.cc
index b5d080669c3..b83bd6bf782 100644
--- a/core/src/stored/stored_conf.cc
+++ b/core/src/stored/stored_conf.cc
@@ -496,6 +496,22 @@ static void ParseConfigCb(LEX *lc, ResourceItem *item, int index, int pass)
    }
 }
 
+bool GetTlsPskByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value)
+{
+//   char *fq_name_buffer = bstrdup(fq_name_);
+//   UnbashSpaces(fq_name_buffer);
+//   std::string fq_name(fq_name_buffer);
+//   free(fq_name_buffer);
+
+   return false;
+}
+
+static void ConfigInitLateCb(ConfigurationParser &my_config)
+{
+  StorageResource *client_resource = (StorageResource *)GetNextRes(R_STORAGE, NULL);
+  client_resource->tls_psk.GetTlsPskByFullyQualifiedResourceNameCb = GetTlsPskByFullyQualifiedResourceName;
+}
+
 ConfigurationParser *InitSdConfig(const char *configfile, int exit_code)
 {
    return new ConfigurationParser(
@@ -513,7 +529,8 @@ ConfigurationParser *InitSdConfig(const char *configfile, int exit_code)
                 resources,
                 res_head,
                 default_config_filename.c_str(),
-                "bareos-sd.d");
+                "bareos-sd.d",
+                ConfigInitLateCb);
 }
 
 bool ParseSdConfig(const char *configfile, int exit_code)
@@ -578,16 +595,6 @@ bool PrintConfigSchemaJson(PoolMem &buffer)
 }
 #endif
 
-bool GetTlsPskByFullyQualifiedResourceName(const char *fq_name_, std::string &psk_return_value)
-{
-//   char *fq_name_buffer = bstrdup(fq_name_);
-//   UnbashSpaces(fq_name_buffer);
-//   std::string fq_name(fq_name_buffer);
-//   free(fq_name_buffer);
-
-   return false;
-}
-
 /* **************************************************************************** */
 } /* namespace storagedaemon  */
 /* **************************************************************************** */