diff --git a/daemon/kdeconnectd.cpp b/daemon/kdeconnectd.cpp
index 9b7e0c363..eed02369f 100644
--- a/daemon/kdeconnectd.cpp
+++ b/daemon/kdeconnectd.cpp
@@ -11,7 +11,6 @@
 #include <QIcon>
 #include <QProcess>
 #include <QQuickStyle>
-#include <QSessionManager>
 #include <QStandardPaths>
 #include <QTimer>
 
@@ -66,6 +65,9 @@ int main(int argc, char *argv[])
     detectPlatform(argc, argv);
     QGuiApplication::setQuitLockEnabled(false);
 
+    // kdeconnectd is autostarted, so disable session management to speed up startup
+    QCoreApplication::setAttribute(Qt::AA_DisableSessionManager);
+
     QApplication app(argc, argv);
     KAboutData aboutData(QStringLiteral("kdeconnect.daemon"),
                          i18n("KDE Connect Daemon"),
@@ -119,12 +121,5 @@ int main(int argc, char *argv[])
     QProcess::startDetached(QStringLiteral("kdeconnect-indicator.exe"), QStringList());
 #endif
 
-    // kdeconnectd is autostarted, so disable session management to speed up startup
-    auto disableSessionManagement = [](QSessionManager &sm) {
-        sm.setRestartHint(QSessionManager::RestartNever);
-    };
-    QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
-    QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
-
     return app.exec();
 }