diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java
index 28072ca4f1137..f1a98adc0ab28 100644
--- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java
@@ -143,7 +143,7 @@ public class CompanionDeviceActivity extends Activity {
     }
 
     static void notifyDevicesChanged() {
-        if (sInstance != null && !sInstance.isFinishing()) {
+        if (sInstance != null && sInstance.mDevicesAdapter != null && !sInstance.isFinishing()) {
             sInstance.mDevicesAdapter.notifyDataSetChanged();
         }
     }