params = hci_conn_params_lookup(hdev, &cp->addr.bdaddr,
                                                le_addr_type(cp->addr.type));
                if (params) {
+                       DECLARE_BITMAP(flags, __HCI_CONN_NUM_FLAGS);
+
+                       bitmap_from_u64(flags, current_flags);
+
+                       /* Devices using RPAs can only be programmed in the
+                        * acceptlist LL Privacy has been enable otherwise they
+                        * cannot mark HCI_CONN_FLAG_REMOTE_WAKEUP.
+                        */
+                       if (test_bit(HCI_CONN_FLAG_REMOTE_WAKEUP, flags) &&
+                           !use_ll_privacy(hdev) &&
+                           hci_find_irk_by_addr(hdev, ¶ms->addr,
+                                                params->addr_type)) {
+                               bt_dev_warn(hdev,
+                                           "Cannot set wakeable for RPA");
+                               goto unlock;
+                       }
+
                        bitmap_from_u64(params->flags, current_flags);
                        status = MGMT_STATUS_SUCCESS;
 
                }
        }
 
+unlock:
        hci_dev_unlock(hdev);
 
 done: