diff --git a/src/com/android/car/messenger/MessengerDelegate.java b/src/com/android/car/messenger/MessengerDelegate.java
index 5a3d2e0..bd5e9fa 100644
--- a/src/com/android/car/messenger/MessengerDelegate.java
+++ b/src/com/android/car/messenger/MessengerDelegate.java
@@ -412,7 +412,7 @@
         final List<Action> actionList = new ArrayList<>();
 
         // Reply action
-        if (shouldAddReplyAction(senderKey.getDeviceAddress())) {
+        if (shouldAddReplyAction(senderKey)) {
             final String replyString = mContext.getString(R.string.action_reply);
             PendingIntent replyIntent = createServiceIntent(senderKey, notificationId,
                     MessengerService.ACTION_VOICE_REPLY);
@@ -444,12 +444,16 @@
         return actionList;
     }
 
-    private boolean shouldAddReplyAction(String deviceAddress) {
+    private boolean shouldAddReplyAction(SenderKey senderKey) {
+        if (mNotificationInfos.get(senderKey).mSenderContactUri == null) {
+            return false;
+        }
+
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         if (adapter == null) {
             return false;
         }
-        BluetoothDevice device = adapter.getRemoteDevice(deviceAddress);
+        BluetoothDevice device = adapter.getRemoteDevice(senderKey.getDeviceAddress());
 
         synchronized (mMapClientLock) {
             return (mBluetoothMapClient != null) && mBluetoothMapClient.isUploadingSupported(
