diff --git a/libnymea/devicemanager.cpp b/libnymea/devicemanager.cpp
index dcce8372..a4d9340c 100644
--- a/libnymea/devicemanager.cpp
+++ b/libnymea/devicemanager.cpp
@@ -1149,14 +1149,28 @@ void DeviceManager::loadConfiguredDevices()
 
         // We always add the device to the list in this case. If its in the storedDevices
         // it means that it was working at some point so lets still add it as there might
-        // be rules associated with this device. Device::setupCompleted() will be false.
-        DeviceSetupStatus status = setupDevice(device);
+        // be rules associated with this device.
         m_configuredDevices.insert(device->id(), device);
+    }
+    settings.endGroup();
 
+    QHash<DeviceId, Device*> setupList = m_configuredDevices;
+    while (!setupList.isEmpty()) {
+        Device *device = nullptr;
+        foreach (Device *d, setupList) {
+            if (d->parentId().isNull() || !setupList.contains(d->parentId())) {
+                device = d;
+                setupList.take(d->id());
+                break;
+            }
+        }
+        Q_ASSERT(device != nullptr);
+
+        DeviceSetupStatus status = setupDevice(device);
         if (status == DeviceSetupStatus::DeviceSetupStatusSuccess)
             postSetupDevice(device);
     }
-    settings.endGroup();
+
 }
 
 void DeviceManager::storeConfiguredDevices()