diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index de43a54c2e..4e10f3ad23 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -626,6 +626,10 @@ static void daemonRunStateInit(void *opaque)
 
     driversInitialized = true;
 
+    virNetDaemonSetShutdownCallbacks(dmn,
+                                     virStateShutdownPrepare,
+                                     virStateShutdownWait);
+
     /* Tie the non-privileged daemons to the session/shutdown lifecycle */
     if (!virNetDaemonIsPrivileged(dmn)) {
 
@@ -1214,9 +1218,6 @@ int main(int argc, char **argv) {
 #endif
 
     /* Run event loop. */
-    virNetDaemonSetShutdownCallbacks(dmn,
-                                     virStateShutdownPrepare,
-                                     virStateShutdownWait);
     virNetDaemonRun(dmn);
 
     ret = 0;