diff --git a/network/ble_device.go b/network/ble_device.go
index 50818021..814f7098 100644
--- a/network/ble_device.go
+++ b/network/ble_device.go
@@ -27,10 +27,14 @@ type bleDeviceJSON struct {
 }
 
 func NewBLEDevice(p gatt.Peripheral, a *gatt.Advertisement, rssi int) *BLEDevice {
+	vendor := ManufLookup(NormalizeMac(p.ID()))
+	if vendor == "" && a != nil {
+		vendor = a.Company
+	}
 	return &BLEDevice{
 		LastSeen:      time.Now(),
 		Device:        p,
-		Vendor:        ManufLookup(NormalizeMac(p.ID())),
+		Vendor:        vendor,
 		Advertisement: a,
 		RSSI:          rssi,
 	}