diff --git a/src/training/shield.rs b/src/training/shield.rs
index 5aec36a..43e9955 100644
--- a/src/training/shield.rs
+++ b/src/training/shield.rs
@@ -241,6 +241,18 @@ unsafe fn mod_handle_sub_guard_cont(fighter: &mut L2CFighterCommon) {
         return;
     }
 
+    if is_in_parry(module_accessor) {
+        return;
+    }
+
+    if MENU.mash_triggers.contains(MashTrigger::SHIELDSTUN) {
+        if MENU.shieldstun_override == Action::empty() {
+            mash::external_buffer_menu_mash(MENU.mash_state.get_random())
+        } else {
+            mash::external_buffer_menu_mash(MENU.shieldstun_override.get_random())
+        }
+    }
+
     let action = mash::get_current_buffer();
 
     if handle_escape_option(fighter, module_accessor) {