1 files changed, 9 insertions, 4 deletions
diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp
index 6c1fc63821..37a892c37f 100644
--- a/src/hid_core/frontend/emulated_controller.cpp
+++ b/src/hid_core/frontend/emulated_controller.cpp
@@ -765,9 +765,13 @@ void EmulatedController::StartMotionCalibration() {
 
 void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback, std::size_t index,
                                    Common::UUID uuid) {
-	if (index >= controller.button_values.size()) {
+    const auto player_index = Service::HID::NpadIdTypeToIndex(npad_id_type);
+    const auto& player = Settings::values.players.GetValue()[player_index];
+
+    if (index >= controller.button_values.size()) {
         return;
     }
+
     std::unique_lock lock{mutex};
     bool value_changed = false;
     const auto new_status = TransformToButton(callback);
@@ -920,10 +924,11 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback
 
     lock.unlock();
 
-    const auto player_index = Service::HID::NpadIdTypeToIndex(npad_id_type);
     if (!is_connected && !controller_connected[player_index]) {
-        Connect();
-        controller_connected[player_index] = true;
+        if (player.connected) {
+            Connect();
+            controller_connected[player_index] = true;
+        }
     }
 
     TriggerOnChange(ControllerTriggerType::Button, true);