diff --git a/res/e3a/races.xml b/res/e3a/races.xml
index 90f311757..ad2e6c1a9 100644
--- a/res/e3a/races.xml
+++ b/res/e3a/races.xml
@@ -651,7 +651,7 @@
     <skill name="stamina" modifier="-10"/>
     <attack type="4" damage="1d2"/>
   </race>
-  <race name="mountainguard" unarmedguard="yes" magres="50" weight="10000" capacity="2000" speed="0.0" hp="1000" ac="12" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="8" cannotmove="yes" nolearn="yes" teach="no" noweapons="yes">
+  <race name="mountainguard" unarmedguard="yes" magres="50" weight="10000" capacity="2000" speed="0.0" hp="1000" ac="12" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="8" cannotmove="yes" nolearn="yes" teach="no" noweapons="yes" noattack="yes">
     <ai splitsize="1"/>
     <attack type="4" damage="2d40"/>
   </race>
diff --git a/res/eressea/races.xml b/res/eressea/races.xml
index ba268888f..20f10e376 100644
--- a/res/eressea/races.xml
+++ b/res/eressea/races.xml
@@ -648,7 +648,7 @@
     <skill name="stamina" modifier="-10"/>
     <attack type="4" damage="1d2"/>
   </race>
-  <race name="mountainguard" unarmedguard="yes" magres="50" maxaura="1.0" regaura="0.5" weight="10000" capacity="2000" speed="0.0" hp="1000" ac="12" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="8" cannotmove="yes" nolearn="yes" teach="no" noweapons="yes">
+  <race name="mountainguard" unarmedguard="yes" magres="50" maxaura="1.0" regaura="0.5" weight="10000" capacity="2000" speed="0.0" hp="1000" ac="12" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="8" cannotmove="yes" nolearn="yes" teach="no" noweapons="yes" noattack="yes">
     <ai splitsize="1"/>
     <attack type="4" damage="2d40"/>
   </race>
diff --git a/scripts/tests/shared/spells.lua b/scripts/tests/shared/spells.lua
index b865252f8..189f761b7 100644
--- a/scripts/tests/shared/spells.lua
+++ b/scripts/tests/shared/spells.lua
@@ -183,3 +183,13 @@ function test_confusion_and_panic()
     end
     process_orders()
 end
+
+function test_mountainguards_cant_attack()
+    local r = region.create(0, 0, 'plain')
+    local u = unit.create(faction.create('human'), r, 1)
+    local f = faction.create('human')
+    local ug = unit.create(f, r, 1, "mountainguard")
+    ug:add_order("ATTACKIERE " .. itoa36(u.id))
+    process_orders()
+    assert_equal('race_no_attack', f.messages[1])
+end