diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 35e12e703..017dcb6bb 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -393,8 +393,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
 
     config_pre_init();
 
-    dbus_core_init();
-
     if (serverGeneration == 1) {
         if ((xf86ServerName = strrchr(argv[0], '/')) != 0)
             xf86ServerName++;
@@ -442,6 +440,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
         if (xf86DoShowOptions)
             DoShowOptions();
 
+        dbus_core_init();
         systemd_logind_init();
 
         /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
@@ -976,7 +975,6 @@ CloseInput(void)
 {
     config_fini();
     mieqFini();
-    dbus_core_fini();
 }
 
 /*
@@ -1058,6 +1056,7 @@ ddxGiveUp(enum ExitCode error)
         xf86CloseConsole();
 
     systemd_logind_fini();
+    dbus_core_fini();
 
     xf86CloseLog(error);