diff --git a/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt b/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt
index a05b78426..c05848490 100644
--- a/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt
@@ -2,6 +2,7 @@ package com.geeksville.mesh.util
 
 import android.app.PendingIntent
 import android.bluetooth.BluetoothDevice
+import android.bluetooth.le.ScanResult
 import android.companion.AssociationInfo
 import android.companion.CompanionDeviceManager
 import android.content.Intent
@@ -46,8 +47,11 @@ fun Intent.getAssociationResult(): String? = when {
 
     android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O ->
         @Suppress("DEPRECATION")
-        getParcelableExtra<BluetoothDevice>(CompanionDeviceManager.EXTRA_DEVICE)
-            ?.address
+        when (val it = getParcelableExtra<Parcelable>(CompanionDeviceManager.EXTRA_DEVICE)) {
+            is BluetoothDevice -> it.address
+            is ScanResult -> it.device.address
+            else -> null
+        }
 
     else -> null
 }