diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index ce713c911..9e079583c 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1956,8 +1956,7 @@ bool Creature::LoadCreatureAddon(bool reload)
     // 1 UnitPVPStateFlags  Set at Creature::UpdateEntry (SetPvp())
     // 2 UnitRename         Pet only, so always 0 for default creature
     // 3 ShapeshiftForm     Must be determined/set by shapeshift spell/aura
-    if (cainfo->sheath_state != 0)
-        SetByteValue(UNIT_FIELD_BYTES_2, 0, cainfo->sheath_state);
+    SetByteValue(UNIT_FIELD_BYTES_2, 0, cainfo->sheath_state);
 
     if (cainfo->pvp_state != 0)
         SetByteValue(UNIT_FIELD_BYTES_2, 1, cainfo->pvp_state);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index b9cf625ab..e3ff4a437 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11407"
+ #define REVISION_NR "11408"
 #endif // __REVISION_NR_H__