diff --git a/libnymea-app/wifisetup/bluetoothdiscovery.cpp b/libnymea-app/wifisetup/bluetoothdiscovery.cpp
index 92ea906f..9c8d262c 100644
--- a/libnymea-app/wifisetup/bluetoothdiscovery.cpp
+++ b/libnymea-app/wifisetup/bluetoothdiscovery.cpp
@@ -180,13 +180,12 @@ void BluetoothDiscovery::deviceDiscovered(const QBluetoothDeviceInfo &deviceInfo
 {
     qCDebug(dcBtWiFiSetup()) << "BluetoothDiscovery: Device discovered:" << deviceInfo.address().toString() << deviceInfo.deviceUuid();
     foreach (BluetoothDeviceInfo *di, m_deviceInfos->deviceInfos()) {
-        if (di->address() == deviceInfo.address().toString()) {
+        if (di->bluetoothDeviceInfo().deviceUuid() == deviceInfo.deviceUuid()) {
             di->setBluetoothDeviceInfo(deviceInfo);
             return;
         }
     }
 
-
     BluetoothDeviceInfo *deviceInformation = new BluetoothDeviceInfo(deviceInfo);
     qCDebug(dcBtWiFiSetup) << "BluetoothDiscovery: [+]" << deviceInformation->name() << "(" << deviceInformation->address() << ")" << (deviceInformation->isLowEnergy() ? "LE" : "") << deviceInfo.serviceUuids();
     m_deviceInfos->addBluetoothDeviceInfo(deviceInformation);