diff --git a/src/blackmisc/dbusserver.cpp b/src/blackmisc/dbusserver.cpp
index 3ad724629..aaa3377ce 100644
--- a/src/blackmisc/dbusserver.cpp
+++ b/src/blackmisc/dbusserver.cpp
@@ -31,14 +31,6 @@ namespace BlackMisc
         {
         case SERVERMODE_SESSIONBUS:
             {
-                QDBusConnection testConnection = QDBusConnection::connectToBus(QDBusConnection::SessionBus, coreServiceName());
-                if (! testConnection.isConnected()) { launchDBusDaemon(); }
-                testConnection.disconnectFromBus(coreServiceName());
-
-                // Sleep for 200 ms in order for dbus-daemon to finish loading.
-                // FIXME: Dirty workaround. Instead polling the server up to x times every 50 ms until its connection is accepted.
-                QThread::msleep(200);
-
                 QDBusConnection connection = QDBusConnection::connectToBus(QDBusConnection::SessionBus, coreServiceName());
                 if (! connection.isConnected() || ! connection.registerService(service))
                 {
@@ -50,13 +42,6 @@ namespace BlackMisc
             break;
         case SERVERMODE_SYSTEMBUS:
             {
-                QDBusConnection testConnection = QDBusConnection::connectToBus(QDBusConnection::SystemBus, coreServiceName());
-                if (! testConnection.isConnected()) { launchDBusDaemon(); }
-                testConnection.disconnectFromBus(coreServiceName());
-
-                // Sleep for 200 ms in order for dbus-daemon to finish loading.
-                QThread::msleep(200);
-
                 QDBusConnection connection = QDBusConnection::connectToBus(QDBusConnection::SystemBus, coreServiceName());
                 if (! connection.isConnected() || ! connection.registerService(service))
                 {
@@ -103,14 +88,6 @@ namespace BlackMisc
         return sn;
     }
 
-    void CDBusServer::launchDBusDaemon()
-    {
-        static const QString program = QStringLiteral("dbus-daemon");
-        static const QStringList arguments = { QStringLiteral("--session") };
-        const bool success = CProcessCtrl::startDetached(program, arguments, false);
-        if (!success) { CLogMessage(this).error("Failed to launch dbus-daemon!"); }
-    }
-
     bool CDBusServer::isP2PAddress(const QString &address)
     {
         return modeOfAddress(address) == SERVERMODE_P2P;
diff --git a/src/blackmisc/dbusserver.h b/src/blackmisc/dbusserver.h
index a990f4a36..46382e4f8 100644
--- a/src/blackmisc/dbusserver.h
+++ b/src/blackmisc/dbusserver.h
@@ -137,7 +137,6 @@ namespace BlackMisc
         QMap<QString, QObject *> m_objects;
         QMap<QString, QDBusConnection> m_connections;
 
-        void launchDBusDaemon();
         static QString getDBusInterfaceFromClassInfo(QObject *object);
 
         //! Register options with connection