diff --git a/js/app.js b/js/app.js
index e22b99c..bf2272e 100644
--- a/js/app.js
+++ b/js/app.js
@@ -1125,6 +1125,8 @@ function setupServerModes() {
 
 // Initialize Avatars Database: Populates all known avatars from metadata
 function initAvatarsList(force = false) {
+  // Prune any non-playable or CW-only avatars that might have been loaded
+  state.avatarsList = state.avatarsList.filter(a => AVATAR_METADATA[a.avatar_id]);
   if (state.avatarsList.length > 0 && !force) {
     let missing = false;
     for (const aidStr in AVATAR_METADATA) {
diff --git a/js/avatars-data.js b/js/avatars-data.js
index 1413ce6..3797d96 100644
--- a/js/avatars-data.js
+++ b/js/avatars-data.js
@@ -2079,7 +2079,10 @@ export const AVATAR_METADATA = {
     "element": "Lightning",
     "rarity": 5,
     "hasExRank": false
-  },
+  }
+};
+
+export const CW_ROLE_METADATA = {
   "6042": {
     "names": {
       "th": "King Pom-Pom",
@@ -2098,7 +2101,7 @@ export const AVATAR_METADATA = {
 
 export function getAvatarInfo(avatarId, langOverride = null) {
   const lang = langOverride || getCurrentLanguage();
-  const meta = AVATAR_METADATA[avatarId];
+  const meta = AVATAR_METADATA[avatarId] || CW_ROLE_METADATA[avatarId];
 
   if (!meta) {
     return {