diff --git a/src/mountfsd/mountwork.c b/src/mountfsd/mountwork.c
index 41a8736066..ded0f3c4bc 100644
--- a/src/mountfsd/mountwork.c
+++ b/src/mountfsd/mountwork.c
@@ -940,7 +940,7 @@ static int run(int argc, char *argv[]) {
         r = varlink_server_new(&server,
                                SD_VARLINK_SERVER_INHERIT_USERDATA|
                                SD_VARLINK_SERVER_ALLOW_FD_PASSING_INPUT|SD_VARLINK_SERVER_ALLOW_FD_PASSING_OUTPUT,
-                               NULL);
+                               &polkit_registry);
         if (r < 0)
                 return log_error_errno(r, "Failed to allocate server: %m");
 
@@ -955,8 +955,6 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to bind methods: %m");
 
-        sd_varlink_server_set_userdata(server, &polkit_registry);
-
         r = sd_varlink_server_set_exit_on_idle(server, true);
         if (r < 0)
                 return log_error_errno(r, "Failed to enable exit-on-idle mode: %m");
diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c
index 44b3f5fc00..a275c3c6e6 100644
--- a/src/nsresourced/nsresourcework.c
+++ b/src/nsresourced/nsresourcework.c
@@ -1761,7 +1761,7 @@ static int run(int argc, char *argv[]) {
                         &server,
                         SD_VARLINK_SERVER_INHERIT_USERDATA|
                         SD_VARLINK_SERVER_ALLOW_FD_PASSING_INPUT|SD_VARLINK_SERVER_ALLOW_FD_PASSING_OUTPUT,
-                        NULL);
+                        &bpf);
         if (r < 0)
                 return log_error_errno(r, "Failed to allocate varlink server: %m");
 
@@ -1785,8 +1785,6 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to bind methods: %m");
 
-        sd_varlink_server_set_userdata(server, &bpf);
-
         r = getenv_bool("NSRESOURCE_FIXED_WORKER");
         if (r < 0)
                 return log_error_errno(r, "Failed to parse NSRESOURCE_FIXED_WORKER: %m");