diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue
index 674216d4c5..d288bb0e80 100644
--- a/website/client/components/avatar.vue
+++ b/website/client/components/avatar.vue
@@ -187,6 +187,11 @@ export default {
     hideGear (gearType) {
       if (gearType === 'weapon') {
         let equippedWeapon = this.member.items.gear[this.costumeClass][gearType];
+
+        if (!equippedWeapon) {
+          return false;
+        }
+
         let equippedIsTwoHanded = this.flatGear[equippedWeapon].twoHanded;
         let hasOverrideShield = this.overrideAvatarGear && this.overrideAvatarGear.shield;