diff --git a/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java b/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java
index 601bd602c12..990d0b4af54 100644
--- a/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java
+++ b/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java
@@ -142,7 +142,7 @@ public class KeyboardShortcuts {
                 if (si != null && si.isAbility()) {
                     matchUI.setShouldAutoYield(si.getKey(), true);
                     int triggerID = Integer.valueOf(si.getSourceTrigger());
-                    if (si.isOptionalTrigger()) {
+                    if (si.isOptionalTrigger() && matchUI.isLocalPlayer(si.getActivatingPlayer())) {
                         matchUI.setShouldAlwaysAcceptTrigger(triggerID);
                     }
                     matchUI.getGameController().passPriority();
@@ -160,7 +160,7 @@ public class KeyboardShortcuts {
                 if (si != null && si.isAbility()) {
                     matchUI.setShouldAutoYield(si.getKey(), true);
                     int triggerID = Integer.valueOf(si.getSourceTrigger());
-                    if (si.isOptionalTrigger()) {
+                    if (si.isOptionalTrigger() && matchUI.isLocalPlayer(si.getActivatingPlayer())) {
                         matchUI.setShouldAlwaysDeclineTrigger(triggerID);
                     }
                     matchUI.getGameController().passPriority();