diff --git a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py b/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
index aee7b22f9..f22439441 100644
--- a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
+++ b/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
@@ -11,7 +11,8 @@ def handler(fit, module, context):
         fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
         if module.charge is not None and module.charge.ID == 47336:
             for mod in fit.modules:
-                if not mod.isEmpty and mod.item.requiresSkill("High Speed Maneuvering") and mod.state > State.ONLINE:
-                    mod.state = State.ONLINE
-                if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > State.ONLINE:
+                if not mod.isEmpty and mod.state > State.ONLINE and (
+                        mod.item.requiresSkill("High Speed Maneuvering")
+                        or mod.item.requiresSkill("Micro Jump Drive Operation")
+                ):
                     mod.state = State.ONLINE
diff --git a/eos/effects/warpscrambleblockmwdwithnpceffect.py b/eos/effects/warpscrambleblockmwdwithnpceffect.py
index f8241436d..2e075207e 100644
--- a/eos/effects/warpscrambleblockmwdwithnpceffect.py
+++ b/eos/effects/warpscrambleblockmwdwithnpceffect.py
@@ -16,7 +16,8 @@ def handler(fit, module, context):
 
     # this is such a dirty hack
     for mod in fit.modules:
-        if not mod.isEmpty and mod.item.requiresSkill("High Speed Maneuvering") and mod.state > State.ONLINE:
-            mod.state = State.ONLINE
-        if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > State.ONLINE:
+        if not mod.isEmpty and mod.state > State.ONLINE and (
+                mod.item.requiresSkill("Micro Jump Drive Operation")
+                or mod.item.requiresSkill("High Speed Maneuvering")
+        ):
             mod.state = State.ONLINE