diff --git a/core/daemon.cpp b/core/daemon.cpp
index e6949822d..f53ba8bc6 100644
--- a/core/daemon.cpp
+++ b/core/daemon.cpp
@@ -147,22 +147,22 @@ QSet<LinkProvider *> Daemon::getLinkProviders() const
     return d->m_linkProviders;
 }
 
-QStringList Daemon::linkProviders() const
+QVector<QStringList> Daemon::linkProviders() const
 {
+    /*
     QString allStr = QStringLiteral("all");
     QString enabledStr = QStringLiteral("enabled");
 
-    QMap<QString, QStringList> returnValue;
-    returnValue[allStr] = QStringList();
-    returnValue[enabledStr] = QStringList();
+    QMap<QString, QString> returnValue;
 
     for (LinkProvider *a : std::as_const(d->m_linkProviders)) {
-        returnValue[allStr].append(a->name());
+        returnValue[allStr] += a->name();
 
         // TODO add filtering by enabled config
-        returnValue[enabledStr].append(a->name());
+        returnValue[enabledStr] += a->name();
     }
-    return returnValue[allStr];
+    return returnValue;*/
+    return QVector<QStringList>();
 }
 QStringList Daemon::devices(bool onlyReachable, bool onlyTrusted) const
 {
diff --git a/core/daemon.h b/core/daemon.h
index b7dfdc7b0..1649ec66d 100644
--- a/core/daemon.h
+++ b/core/daemon.h
@@ -64,7 +64,7 @@ public Q_SLOTS:
     Q_SCRIPTABLE QMap<QString, QString> deviceNames(bool onlyReachable = false, bool onlyPaired = false) const;
 
     Q_SCRIPTABLE QString deviceIdByName(const QString &name) const;
-    Q_SCRIPTABLE QStringList linkProviders() const;
+    Q_SCRIPTABLE QVector<QStringList> linkProviders() const;
     Q_SCRIPTABLE virtual void sendSimpleNotification(const QString &eventId, const QString &title, const QString &text, const QString &iconName) = 0;
 
 Q_SIGNALS:
diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
index 183bbda04..d02021154 100644
--- a/kcm/kcm.cpp
+++ b/kcm/kcm.cpp
@@ -111,13 +111,14 @@ KdeConnectKcm::KdeConnectKcm(QObject *parent, const KPluginMetaData &md, const Q
     */
     setWhenAvailable(
         daemon->linkProviders(),
-        [this](bool error, const QStringList linkProviders) {
-            for (int i = 0; i < linkProviders.size(); ++i) {
-                QString linkProvider = QString(linkProviders.at(i).constData());
-                QListWidgetItem *linkProviderItem = new QListWidgetItem(linkProvider, kcmUi.linkProviders_list);
-                linkProviderItem->setCheckState(Qt::Checked);
-                kcmUi.linkProviders_list->addItem(linkProviderItem);
-            }
+        [this](bool error, const QVector<QStringList> linkProviders) { /*
+             for (int i = 0; i < linkProviders[QStringLiteral("all")].size(); ++i) {
+                 QString linkProvider = QString(linkProviders[QStringLiteral("all")].at(i).constData());
+                 QListWidgetItem *linkProviderItem = new QListWidgetItem(linkProvider, kcmUi.linkProviders_list);
+                 linkProviderItem->setCheckState(Qt::Checked);
+                 kcmUi.linkProviders_list->addItem(linkProviderItem);
+             }*/
+
         },
         this);