diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index f3f53875b..2f8b42556 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -20144,7 +20144,8 @@ void Player::AutoUnequipOffhandIfNeed()
         return;
 
     // need unequip offhand for 2h-weapon without TitanGrip (in any from hands)
-    if (CanDualWield() && (CanTitanGrip() || (offItem->GetProto()->InventoryType != INVTYPE_2HWEAPON && !IsTwoHandUsed())))
+    if ((CanDualWield() || offItem->GetProto()->InventoryType == INVTYPE_SHIELD || offItem->GetProto()->InventoryType == INVTYPE_HOLDABLE) &&
+        (CanTitanGrip() || (offItem->GetProto()->InventoryType != INVTYPE_2HWEAPON && !IsTwoHandUsed())))
         return;
 
     ItemPosCountVec off_dest;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index c51e523c8..480ab4504 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 "10573"
+ #define REVISION_NR "10574"
 #endif // __REVISION_NR_H__