diff --git a/website/client/components/inventory/equipment.vue b/website/client/components/inventory/equipment.vue
index fa0785048b..f4476917ad 100644
--- a/website/client/components/inventory/equipment.vue
+++ b/website/client/components/inventory/equipment.vue
@@ -65,8 +65,8 @@
           v-for="(label, group) in gearTypesToStrings",
           :key="group",
           :item="flatGear[activeItems[group]]",
-          :itemContentClass="'shop_' + flatGear[activeItems[group]].key",
-          :showPopover="flatGear[activeItems[group]] && flatGear[activeItems[group]].key.indexOf('_base_0') === -1",
+          :itemContentClass="flatGear[activeItems[group]] ? 'shop_' + flatGear[activeItems[group]].key : null",
+          :showPopover="!!flatGear[activeItems[group]] && flatGear[activeItems[group]].key.indexOf('_base_0') === -1",
           :label="$t(label)",
           :selected="true",
           :popoverPosition="'top'",
diff --git a/website/client/components/inventory/equipmentAttributesPopover.vue b/website/client/components/inventory/equipmentAttributesPopover.vue
index e44a5d168e..1beca9046c 100644
--- a/website/client/components/inventory/equipmentAttributesPopover.vue
+++ b/website/client/components/inventory/equipmentAttributesPopover.vue
@@ -1,10 +1,10 @@
 <template lang="pug">
 div
-  h4.popover-content-title(v-once) {{ item.text() }}
-  .popover-content-text(v-once) {{ item.notes() }}
+  h4.popover-content-title {{ item.text() }}
+  .popover-content-text {{ item.notes() }}
   .popover-content-attr(v-for="attr in ATTRIBUTES", :key="attr", v-once)
-    span.popover-content-attr-key(v-once) {{ `${$t(attr)}: ` }}
-    span.popover-content-attr-val(v-once) {{ `+${item[attr]}` }}
+    span.popover-content-attr-key {{ `${$t(attr)}: ` }}
+    span.popover-content-attr-val {{ `+${item[attr]}` }}
 </template>
 
 <script>