diff --git a/client/src/components/construct.jsx b/client/src/components/construct.jsx
index c8ca98a3..ec3d7813 100644
--- a/client/src/components/construct.jsx
+++ b/client/src/components/construct.jsx
@@ -13,8 +13,8 @@ const { ConstructAnimation } = require('./animations');
 
 const addState = connect(
     function receiveState(state) {
-        const { animSource, animTarget, resolution, account } = state;
-        return { animSource, animTarget, resolution, account };
+        const { animating, animSource, animTarget, resolution, account } = state;
+        return { animating, animSource, animTarget, resolution, account };
     }
 );
 
@@ -43,6 +43,7 @@ class ConstructAvatar extends Component {
     }
 
     onClick() {
+        if (this.props.animating) return false;
         return this.animations.push(wiggle(this.props.construct.id, this.idle));
     }
 
diff --git a/core/src/skill.rs b/core/src/skill.rs
index 0f8c15bd..9d4d3902 100644
--- a/core/src/skill.rs
+++ b/core/src/skill.rs
@@ -637,6 +637,9 @@ impl Skill {
             Skill::Heal |
             Skill::HealPlus |
             Skill::HealPlusPlus |
+            Skill::Hybrid |
+            Skill::HybridPlus |
+            Skill::HybridPlusPlus |
             Skill::Absorb |
             Skill::AbsorbPlus |
             Skill::AbsorbPlusPlus |