diff --git a/modules/game_cyclopedia/tab/charms/charms.lua b/modules/game_cyclopedia/tab/charms/charms.lua
index 681fef0b43..ac10093ee2 100644
--- a/modules/game_cyclopedia/tab/charms/charms.lua
+++ b/modules/game_cyclopedia/tab/charms/charms.lua
@@ -362,7 +362,9 @@ function Cyclopedia.loadCharms(charmsData)
     end
     local CharmList = isModernUI and UI.mainPanelCharmsType.panelCharmList.CharmList or UI.CharmList
     local player = g_game.getLocalPlayer()
-
+    if not CharmList then
+        return
+    end
     if isModernUI then
         local formatResourceBalance = function(resourceType, maxResourceType)
             return string.format("%d/%d", player:getResourceBalance(resourceType),
diff --git a/src/client/protocolgameparse.cpp b/src/client/protocolgameparse.cpp
index 23efef0d1e..32ffaab209 100644
--- a/src/client/protocolgameparse.cpp
+++ b/src/client/protocolgameparse.cpp
@@ -4103,8 +4103,10 @@ void ProtocolGame::parseShowDescription(const InputMessagePtr& msg)
 
 void ProtocolGame::parseBestiaryTracker(const InputMessagePtr& msg)
 {
-    const uint8_t trackerType = msg->getU8(); // 0x00 para bestiary, 0x01 para boss
-
+    uint8_t trackerType = 0;
+    if (g_game.getClientVersion() >= 1320) {
+        trackerType = msg->getU8(); // 0x00 for bestiary, 0x01 for boss
+    }
     const uint8_t size = msg->getU8();
     std::vector<std::tuple<uint16_t, uint32_t, uint16_t, uint16_t, uint16_t, uint8_t>> trackerData;