diff --git a/senic/devicepluginsenic.cpp b/senic/devicepluginsenic.cpp
index 7473d228..224db6f4 100644
--- a/senic/devicepluginsenic.cpp
+++ b/senic/devicepluginsenic.cpp
@@ -140,15 +140,6 @@ void DevicePluginSenic::deviceRemoved(Device *device)
     }
 }
 
-bool DevicePluginSenic::verifyExistingDevices(const QBluetoothDeviceInfo &deviceInfo)
-{
-    foreach (Device *device, myDevices()) {
-        if (device->paramValue(nuimoDeviceMacParamTypeId).toString() == deviceInfo.address().toString())
-            return true;
-    }
-
-    return false;
-}
 
 void DevicePluginSenic::onReconnectTimeout()
 {
@@ -159,6 +150,7 @@ void DevicePluginSenic::onReconnectTimeout()
     }
 }
 
+
 void DevicePluginSenic::onBluetoothDiscoveryFinished()
 {
     BluetoothDiscoveryReply *reply = static_cast<BluetoothDiscoveryReply *>(sender());
@@ -169,17 +161,21 @@ void DevicePluginSenic::onBluetoothDiscoveryFinished()
         return;
     }
 
-
     QList<DeviceDescriptor> deviceDescriptors;
     foreach (const QBluetoothDeviceInfo &deviceInfo, reply->discoveredDevices()) {
         if (deviceInfo.name().contains("Nuimo")) {
-            if (!verifyExistingDevices(deviceInfo)) {
-                DeviceDescriptor descriptor(nuimoDeviceClassId, "Nuimo", deviceInfo.name() + " (" + deviceInfo.address().toString() + ")");
-                ParamList params;
-                params.append(Param(nuimoDeviceMacParamTypeId, deviceInfo.address().toString()));
-                descriptor.setParams(params);
-                deviceDescriptors.append(descriptor);
+            DeviceDescriptor descriptor(nuimoDeviceClassId, "Nuimo", deviceInfo.name() + " (" + deviceInfo.address().toString() + ")");
+            ParamList params;
+
+            foreach (Device *existingDevice, myDevices()) {
+                if (existingDevice->paramValue(nuimoDeviceMacParamTypeId).toString() == deviceInfo.address().toString()) {
+                    descriptor.setDeviceId(existingDevice->id());
+                    break;
+                }
             }
+            params.append(Param(nuimoDeviceMacParamTypeId, deviceInfo.address().toString()));
+            descriptor.setParams(params);
+            deviceDescriptors.append(descriptor);
         }
     }
 
@@ -210,7 +206,6 @@ void DevicePluginSenic::onSwipeDetected(const Nuimo::SwipeDirection &direction)
     Nuimo *nuimo = static_cast<Nuimo *>(sender());
     Device *device = m_nuimos.value(nuimo);
 
-
     switch (direction) {
     case Nuimo::SwipeDirectionLeft:
         emitEvent(Event(nuimoPressedEventTypeId, device->id(), ParamList() << Param(nuimoPressedEventButtonNameParamTypeId, "←")));
@@ -260,5 +255,4 @@ void DevicePluginSenic::onPluginConfigurationChanged(const ParamTypeId &paramTyp
         qCDebug(dcSenic()) << "Auto symbol mode" << (value.toBool() ? "enabled." : "disabled.");
         m_autoSymbolMode = value.toBool();
     }
-
 }
diff --git a/senic/devicepluginsenic.h b/senic/devicepluginsenic.h
index 1ff2e7e8..a6593d8b 100644
--- a/senic/devicepluginsenic.h
+++ b/senic/devicepluginsenic.h
@@ -51,8 +51,6 @@ private:
     PluginTimer *m_reconnectTimer = nullptr;
     bool m_autoSymbolMode = true;
 
-    bool verifyExistingDevices(const QBluetoothDeviceInfo &deviceInfo);
-
 private slots:
     void onPluginConfigurationChanged(const ParamTypeId &paramTypeId, const QVariant &value);
     void onReconnectTimeout();