1 files changed, 3 insertions, 1 deletions

diff --git a/src/hid_core/resources/npad/npad_resource.cpp b/src/hid_core/resources/npad/npad_resource.cpp
index b0255a05c..ea9fc14ed 100644
--- a/src/hid_core/resources/npad/npad_resource.cpp
+++ b/src/hid_core/resources/npad/npad_resource.cpp
@@ -46,7 +46,9 @@ Result NPadResource::RegisterAppletResourceUserId(u64 aruid) {
             data_index = i;
             break;
         }
-        if (registration_list.flag[i] == RegistrationStatus::None) {
+        // TODO: Don't Handle pending delete here
+        if (registration_list.flag[i] == RegistrationStatus::None ||
+            registration_list.flag[i] == RegistrationStatus::PendingDelete) {
             data_index = i;
             break;
         }