diff --git a/src/server/game/Entities/Player/PlayerSettings.cpp b/src/server/game/Entities/Player/PlayerSettings.cpp
index f81bfe9a9..19f161987 100644
--- a/src/server/game/Entities/Player/PlayerSettings.cpp
+++ b/src/server/game/Entities/Player/PlayerSettings.cpp
@@ -78,6 +78,13 @@ PlayerSetting Player::GetPlayerSetting(std::string source, uint8 index)
         return GetPlayerSetting(source, index);
     }
 
+    PlayerSettingVector settingVector = itr->second;
+    if (settingVector.size() < (uint8)(index + 1))
+    {
+        UpdatePlayerSetting(source, index, 0);
+        return GetPlayerSetting(source, index);
+    }
+
     return itr->second[index];
 }