diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
index d170da871c8..0bd6868b031 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
@@ -70,6 +70,8 @@ public class ChangeZoneAi extends SpellAbilityAi {
                     return false;
                 }
             }
+        } else if (aiLogic.equals("RaidOnly")) {
+            return ai.getAttackedWithCreatureThisTurn();
         }
 
         return super.checkAiLogic(ai, sa, aiLogic);
diff --git a/forge-gui/res/cardsfolder/r/repeating_barrage.txt b/forge-gui/res/cardsfolder/r/repeating_barrage.txt
index 1fa046cefb3..7002d8736c6 100644
--- a/forge-gui/res/cardsfolder/r/repeating_barrage.txt
+++ b/forge-gui/res/cardsfolder/r/repeating_barrage.txt
@@ -2,7 +2,7 @@ Name:Repeating Barrage
 ManaCost:1 R R
 Types:Sorcery
 A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player.
-A:AB$ ChangeZone | Cost$ 3 R R | PrecostDesc$ Raid — | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | CheckSVar$ RaidTest | References$ RaidTest | SpellDescription$ Return CARDNAME from your graveyard to your hand. Activate this ability only if you attacked with a creature this turn.
+A:AB$ ChangeZone | Cost$ 3 R R | PrecostDesc$ Raid — | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | CheckSVar$ RaidTest | References$ RaidTest | AILogic$ RaidOnly | SpellDescription$ Return CARDNAME from your graveyard to your hand. Activate this ability only if you attacked with a creature this turn.
 SVar:RaidTest:Count$AttackersDeclared
 SVar:Picture:http://www.wizards.com/global/images/magic/general/repeating_barrage.jpg
 Oracle:Repeating Barrage deals 3 damage to target creature or player.\nRaid — {3}{R}{R}: Return Repeating Barrage from your graveyard to your hand. Activate this ability only if you attacked with a creature this turn.