diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue
index d3bc1a3967..674216d4c5 100644
--- a/website/client/components/avatar.vue
+++ b/website/client/components/avatar.vue
@@ -30,8 +30,8 @@
       span(:class="getGearClass('head')")
       span(:class="getGearClass('headAccessory')")
       span(:class="'hair_flower_' + member.preferences.hair.flower")
-      span(:class="getGearClass('shield')")
-      span(:class="getGearClass('weapon')")
+      span(v-if="!hideGear('shield')", :class="getGearClass('shield')")
+      span(v-if="!hideGear('weapon')", :class="getGearClass('weapon')")
 
     // Resting
     span.zzz(v-if="member.preferences.sleep")
@@ -71,6 +71,8 @@
 </style>
 
 <script>
+import { mapState } from 'client/libs/store';
+
 import ClassBadge from 'client/components/members/classBadge';
 
 export default {
@@ -117,6 +119,9 @@ export default {
     },
   },
   computed: {
+    ...mapState({
+      flatGear: 'content.gear.flat',
+    }),
     hasClass () {
       return this.$store.getters['members:hasClass'](this.member);
     },
@@ -179,6 +184,20 @@ export default {
 
       return result;
     },
+    hideGear (gearType) {
+      if (gearType === 'weapon') {
+        let equippedWeapon = this.member.items.gear[this.costumeClass][gearType];
+        let equippedIsTwoHanded = this.flatGear[equippedWeapon].twoHanded;
+        let hasOverrideShield = this.overrideAvatarGear && this.overrideAvatarGear.shield;
+
+        return equippedIsTwoHanded && hasOverrideShield;
+      } else if (gearType === 'shield') {
+        let overrideWeapon = this.overrideAvatarGear && this.overrideAvatarGear.weapon;
+        let overrideIsTwoHanded = overrideWeapon && this.flatGear[overrideWeapon].twoHanded;
+
+        return overrideIsTwoHanded;
+      }
+    },
     castEnd (e) {
       if (!this.$store.state.spellOptions.castingSpell) return;
       this.$root.$emit('castEnd', this.member, 'user', e);