diff --git a/src/preferences/bluetooth/BluetoothSettingsView.cpp b/src/preferences/bluetooth/BluetoothSettingsView.cpp
index 0b4d2e4dad..b60115ed5c 100644
--- a/src/preferences/bluetooth/BluetoothSettingsView.cpp
+++ b/src/preferences/bluetooth/BluetoothSettingsView.cpp
@@ -262,7 +262,8 @@ BluetoothSettingsView::_BuildLocalDevicesMenu()
 void
 BluetoothSettingsView::_MarkLocalDevice(LocalDevice* lDevice)
 {
-	// TODO: Device integrity should be rechecked.
+	if (bdaddrUtils::Compare(lDevice->GetBluetoothAddress(), BDADDR_NULL))
+		return;
 
 	fExtDeviceView->SetLocalDevice(lDevice);
 	fExtDeviceView->SetEnabled(true);