diff --git a/core/dbushelper.cpp b/core/dbushelper.cpp
index 6fe6c958..b9a16a8d 100644
--- a/core/dbushelper.cpp
+++ b/core/dbushelper.cpp
@@ -1,147 +1,191 @@
 /**
  * Copyright 2014 Albert Vaca <albertvaka@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "dbushelper.h"
 #include "core_debug.h"
 
 #include <QRegExp>
 #include <QProcess>
 #include <QDebug>
 #include <QUrl>
 #include <QFile>
 #include <QCoreApplication>
 
 #include "kdeconnectconfig.h"
 
 #ifdef Q_OS_MAC
 #include <CoreFoundation/CFBundle.h>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
 #endif
 
 namespace DbusHelper {
 
 #ifdef USE_PRIVATE_DBUS
 class DBusInstancePrivate
 {
 public:
     DBusInstancePrivate();
     ~DBusInstancePrivate();
 
     void launchDBusDaemon();
     void closeDBusDaemon();
 private:
     QProcess *m_dbusProcess;
 };
 
 static DBusInstancePrivate dbusInstance;
 #endif
 
 void filterNonExportableCharacters(QString& s)
 {
     static QRegExp regexp(QStringLiteral("[^A-Za-z0-9_]"), Qt::CaseSensitive, QRegExp::Wildcard);
     s.replace(regexp,QLatin1String("_"));
 }
 
 QDBusConnection sessionBus()
 {
 #ifdef USE_PRIVATE_DBUS
     return QDBusConnection::connectToBus(KdeConnectConfig::instance()->privateDBusAddress(),
         QStringLiteral(KDECONNECT_PRIVATE_DBUS_NAME));
 #else
     return QDBusConnection::sessionBus();
 #endif
 }
 
 #ifdef USE_PRIVATE_DBUS
 void launchDBusDaemon()
 {
     dbusInstance.launchDBusDaemon();
+    qAddPostRoutine(closeDBusDaemon);
 }
 
 void closeDBusDaemon()
 {
     dbusInstance.closeDBusDaemon();
 }
 
+#ifdef Q_OS_MAC
+void macosUnsetLaunchctlEnv()
+{
+    // Unset Launchd env
+    QProcess unsetLaunchdDBusEnv;
+    unsetLaunchdDBusEnv.setProgram(QStringLiteral("launchctl"));
+    unsetLaunchdDBusEnv.setArguments({
+        QStringLiteral("unsetenv"),
+        QStringLiteral(KDECONNECT_SESSION_DBUS_LAUNCHD_ENV)
+    });
+    unsetLaunchdDBusEnv.start();
+    unsetLaunchdDBusEnv.waitForFinished();
+}
+#endif
+
 void DBusInstancePrivate::launchDBusDaemon()
 {
     // Kill old dbus daemon
     if (m_dbusProcess != nullptr) closeDBusDaemon();
 
     // Start dbus daemon
     m_dbusProcess = new QProcess();
     #ifdef Q_OS_MAC
         // On macOS, assuming the executable is in Contents/MacOS
         CFURLRef url = (CFURLRef)CFAutorelease((CFURLRef)CFBundleCopyBundleURL(CFBundleGetMainBundle()));
         QString basePath = QUrl::fromCFURL(url).path();
         QString kdeconnectDBusExecutable = basePath + QStringLiteral("Contents/MacOS/dbus-daemon"),
                 kdeconnectDBusConfiguration = basePath + QStringLiteral("Contents/Resources/dbus-1/session.conf");
         qCDebug(KDECONNECT_CORE) << "App package path: " << basePath;
 
         m_dbusProcess->setProgram(kdeconnectDBusExecutable);
         m_dbusProcess->setArguments({QStringLiteral("--print-address"),
             QStringLiteral("--nofork"),
             QStringLiteral("--config-file=") + kdeconnectDBusConfiguration,
             QStringLiteral("--address=") + QStringLiteral(KDECONNECT_PRIVATE_DBUS_ADDR)});
         m_dbusProcess->setWorkingDirectory(basePath);
     #elif defined(Q_OS_WIN)
         // On Windows
         m_dbusProcess->setProgram(QStringLiteral("dbus-daemon.exe"));
         m_dbusProcess->setArguments({QStringLiteral("--session"),
             QStringLiteral("--print-address"),
             QStringLiteral("--nofork"),
             QStringLiteral("--address=") + QStringLiteral(KDECONNECT_PRIVATE_DBUS_ADDR)});
     #else
         // On Linux or other unix-like system
         m_dbusProcess->setProgram(QStringLiteral("dbus-daemon"));
         m_dbusProcess->setArguments({QStringLiteral("--session"),
             QStringLiteral("--print-address"),
             QStringLiteral("--nofork"),
             QStringLiteral("--address=") + QStringLiteral(KDECONNECT_PRIVATE_DBUS_ADDR)});
     #endif
     m_dbusProcess->setStandardOutputFile(KdeConnectConfig::instance()->privateDBusAddressPath());
     m_dbusProcess->setStandardErrorFile(QProcess::nullDevice());
     m_dbusProcess->start();
+
+#ifdef Q_OS_MAC
+    // Set launchctl env
+    QString privateDBusAddress = KdeConnectConfig::instance()->privateDBusAddress();
+    QRegularExpressionMatch path;
+    if (privateDBusAddress.contains(QRegularExpression(
+            QStringLiteral("path=(?<path>/tmp/dbus-[A-Za-z0-9]+)")
+        ), &path)) {
+        qCDebug(KDECONNECT_CORE) << "DBus address: " << path.captured(QStringLiteral("path"));
+        QProcess setLaunchdDBusEnv;
+        setLaunchdDBusEnv.setProgram(QStringLiteral("launchctl"));
+        setLaunchdDBusEnv.setArguments({
+            QStringLiteral("setenv"),
+            QStringLiteral(KDECONNECT_SESSION_DBUS_LAUNCHD_ENV),
+            path.captured(QStringLiteral("path"))
+        });
+        setLaunchdDBusEnv.start();
+        setLaunchdDBusEnv.waitForFinished();
+    } else {
+        qCDebug(KDECONNECT_CORE) << "Cannot get dbus address";
+    }
+#endif
 }
 
 void DBusInstancePrivate::closeDBusDaemon()
 {
     if (m_dbusProcess != nullptr)
     {
         m_dbusProcess->terminate();
         m_dbusProcess->waitForFinished();
         delete m_dbusProcess;
         m_dbusProcess = nullptr;
 
         QFile privateDBusAddressFile(KdeConnectConfig::instance()->privateDBusAddressPath());
 
         if (privateDBusAddressFile.exists()) privateDBusAddressFile.resize(0);
+
+#ifdef Q_OS_MAC
+        macosUnsetLaunchctlEnv();
+#endif
     }
 }
 
 DBusInstancePrivate::DBusInstancePrivate()
     :m_dbusProcess(nullptr){}
 
 DBusInstancePrivate::~DBusInstancePrivate()
 {
     closeDBusDaemon();
 }
 #endif
 
 }
diff --git a/core/dbushelper.h.in b/core/dbushelper.h.in
index ae070176..afcf392b 100644
--- a/core/dbushelper.h.in
+++ b/core/dbushelper.h.in
@@ -1,41 +1,46 @@
 /**
  * Copyright 2014 Albert Vaca <albertvaka@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef KDECONNECT_DBUSHELPER_H
 #define KDECONNECT_DBUSHELPER_H
 #include <QString>
 #include <QDBusConnection>
 
 #include "kdeconnectcore_export.h"
 
 #define KDECONNECT_PRIVATE_DBUS_ADDR "${KDECONNECT_PRIVATE_DBUS_ADDR}"
 #define KDECONNECT_PRIVATE_DBUS_NAME "${KDECONNECT_PRIVATE_DBUS_NAME}"
 
+#define KDECONNECT_SESSION_DBUS_LAUNCHD_ENV "DBUS_LAUNCHD_SESSION_BUS_SOCKET"
+
 namespace DbusHelper {
     void KDECONNECTCORE_EXPORT filterNonExportableCharacters(QString& s);
 
 #ifdef USE_PRIVATE_DBUS
     void KDECONNECTCORE_EXPORT launchDBusDaemon();
     void KDECONNECTCORE_EXPORT closeDBusDaemon();
 #endif
     QDBusConnection KDECONNECTCORE_EXPORT sessionBus();
+#ifdef Q_OS_MAC
+    void KDECONNECTCORE_EXPORT macosUnsetLaunchctlEnv();
+#endif
 }
 
 #endif
diff --git a/indicator/main.cpp b/indicator/main.cpp
index 3ef31c82..c9bb94ce 100644
--- a/indicator/main.cpp
+++ b/indicator/main.cpp
@@ -1,159 +1,196 @@
 /*
  * Copyright 2016 Aleix Pol Gonzalez <aleixpol@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <QApplication>
 #include <QProcess>
 #include <QThread>
+#include <QMessageBox>
 
 #ifdef QSYSTRAY
 #include <QSystemTrayIcon>
 #else
 #include <KStatusNotifierItem>
 #endif
 
 #include <KDBusService>
 #include <KAboutData>
 #include <KCMultiDialog>
 #include <KLocalizedString>
 
 #include "interfaces/devicesmodel.h"
 #include "interfaces/dbusinterfaces.h"
 #include "kdeconnect-version.h"
 #include "deviceindicator.h"
 
 #ifdef Q_OS_MAC
 #include <CoreFoundation/CFBundle.h>
 #endif
 
 #include <dbushelper.h>
 
 int main(int argc, char** argv)
 {
     QApplication app(argc, argv);
     KAboutData about(QStringLiteral("kdeconnect-indicator"),
                      i18n("KDE Connect Indicator"),
                      QStringLiteral(KDECONNECT_VERSION_STRING),
                      i18n("KDE Connect Indicator tool"),
                      KAboutLicense::GPL,
                      i18n("(C) 2016 Aleix Pol Gonzalez"));
     KAboutData::setApplicationData(about);
 
 #ifdef Q_OS_WIN
     QProcess kdeconnectd;
     kdeconnectd.start(QStringLiteral("kdeconnectd.exe"));
 #endif
 
 #ifdef Q_OS_MAC
+    // Unset launchctl env, avoid block
+    DbusHelper::macosUnsetLaunchctlEnv();
+
     // Get bundle path
     CFURLRef url = (CFURLRef)CFAutorelease((CFURLRef)CFBundleCopyBundleURL(CFBundleGetMainBundle()));
     QString basePath = QUrl::fromCFURL(url).path();
     
+    // Start kdeconnectd
     QProcess kdeconnectdProcess;
-    kdeconnectdProcess.start(basePath + QStringLiteral("Contents/MacOS/kdeconnectd"));    // Start kdeconnectd
-    QThread::sleep(5);      // Wait for kdeconnectd and its dbus-daemon
+    kdeconnectdProcess.start(basePath + QStringLiteral("Contents/MacOS/kdeconnectd"));
+
+    // Wait for dbus daemon env
+    QProcess getLaunchdDBusEnv;
+    int retry = 0;
+    do {
+        getLaunchdDBusEnv.setProgram(QStringLiteral("launchctl"));
+        getLaunchdDBusEnv.setArguments({
+            QStringLiteral("getenv"),
+            QStringLiteral(KDECONNECT_SESSION_DBUS_LAUNCHD_ENV)
+        });
+        getLaunchdDBusEnv.start();
+        getLaunchdDBusEnv.waitForFinished();
+
+        QString launchdDBusEnv = QString::fromLocal8Bit(getLaunchdDBusEnv.readAllStandardOutput());
+
+        if (launchdDBusEnv.length() > 0) {
+            break;
+        } else if (retry >= 10) {
+            // Show a warning and exit
+            qCritical() << "Fail to get launchctl" << KDECONNECT_SESSION_DBUS_LAUNCHD_ENV << "env";
+
+            QMessageBox::critical(nullptr, i18n("KDE Connect"),
+                                  i18n("Cannot connect to DBus\n"
+                                  "KDE Connect will quit"),
+                                  QMessageBox::Abort,
+                                  QMessageBox::Abort);
+
+            return -1;
+        } else {
+            QThread::sleep(1);  // Retry after 1s
+            retry++;
+        }
+    } while(true);
 #endif
 
 #ifndef USE_PRIVATE_DBUS
     KDBusService dbusService(KDBusService::Unique);
 #endif
 
     DevicesModel model;
     model.setDisplayFilter(DevicesModel::Reachable | DevicesModel::Paired);
     QMenu* menu = new QMenu;
 
     DaemonDbusInterface iface;
     auto refreshMenu = [&iface, &model, &menu]() {
         menu->clear();
         auto configure = menu->addAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Configure..."));
         QObject::connect(configure, &QAction::triggered, configure, [](){
             KCMultiDialog* dialog = new KCMultiDialog;
             dialog->addModule(QStringLiteral("kcm_kdeconnect"));
             dialog->setAttribute(Qt::WA_DeleteOnClose);
             dialog->show();
         });
         for (int i=0, count = model.rowCount(); i<count; ++i) {
             DeviceDbusInterface* device = model.getDevice(i);
             auto indicator = new DeviceIndicator(device);
             QObject::connect(device, &DeviceDbusInterface::destroyed, indicator, &QObject::deleteLater);
 
             menu->addMenu(indicator);
         }
         const QStringList requests = iface.pairingRequests();
         if (!requests.isEmpty()) {
             menu->addSection(i18n("Pairing requests"));
 
             for(const auto& req: requests) {
                 DeviceDbusInterface* dev = new DeviceDbusInterface(req, menu);
                 auto pairMenu = menu->addMenu(dev->name());
                 pairMenu->addAction(i18n("Pair"), dev, &DeviceDbusInterface::acceptPairing);
                 pairMenu->addAction(i18n("Reject"), dev, &DeviceDbusInterface::rejectPairing);
             }
         }
 
 #if (defined Q_OS_MAC || defined Q_OS_WIN)
         // Add quit menu
         menu->addAction(i18n("Quit"), [](){
             QCoreApplication::quit();   // Close this application
         });
 #endif
     };
 
     QObject::connect(&iface, &DaemonDbusInterface::pairingRequestsChangedProxy, &model, refreshMenu);
     QObject::connect(&model, &DevicesModel::rowsInserted, &model, refreshMenu);
     QObject::connect(&model, &DevicesModel::rowsRemoved, &model, refreshMenu);
 
 #ifdef Q_OS_MAC
     QStringList themeSearchPaths = QIcon::themeSearchPaths();
     themeSearchPaths << basePath + QStringLiteral("Contents/Resources/icons/");
     QIcon::setThemeSearchPaths(themeSearchPaths);
 #endif
 
 #ifdef QSYSTRAY
     QSystemTrayIcon systray;
     systray.setIcon(QIcon::fromTheme(QStringLiteral("kdeconnectindicatordark")));
     systray.setVisible(true);
     systray.setToolTip(QStringLiteral("KDE Connect"));
     QObject::connect(&model, &DevicesModel::rowsChanged, &model, [&systray, &model]() {
         systray.setToolTip(i18np("%1 device connected", "%1 devices connected", model.rowCount()));
     });
 
     systray.setContextMenu(menu);
 #else
     KStatusNotifierItem systray;
     systray.setIconByName(QStringLiteral("kdeconnectindicatordark"));
     systray.setToolTip(QStringLiteral("kdeconnect"), QStringLiteral("KDE Connect"), QStringLiteral("KDE Connect"));
     systray.setCategory(KStatusNotifierItem::Communications);
     systray.setStatus(KStatusNotifierItem::Passive);
     systray.setStandardActionsEnabled(false);
     QObject::connect(&model, &DevicesModel::rowsChanged, &model, [&systray, &model]() {
         const auto count = model.rowCount();
         systray.setStatus(count == 0 ? KStatusNotifierItem::Passive : KStatusNotifierItem::Active);
         systray.setToolTip(QStringLiteral("kdeconnect"), QStringLiteral("KDE Connect"), i18np("%1 device connected", "%1 devices connected", count));
     });
 
     systray.setContextMenu(menu);
 #endif
 
     refreshMenu();
 
     app.setQuitOnLastWindowClosed(false);
 
     return app.exec();
 }