diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 3b76a3479a..761f559123 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -13172,14 +13172,15 @@ bool Player::IsTwoHandUsed() const
 
 bool Player::IsUsingTwoHandedWeaponInOneHand() const
 {
-    Item* mainItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
     Item* offItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
+    if (offItem && offItem->GetTemplate()->InventoryType == INVTYPE_2HWEAPON)
+        return true;
 
-    if (!mainItem || !offItem)
+    Item* mainItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
+    if (!mainItem || mainItem->GetTemplate()->InventoryType != INVTYPE_2HWEAPON)
         return false;
 
-    if (mainItem->GetTemplate()->InventoryType != INVTYPE_2HWEAPON &&
-        offItem->GetTemplate()->InventoryType != INVTYPE_2HWEAPON)
+    if (!offItem)
         return false;
 
     return true;