diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
index a456a90a1..4d2515c8b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
@@ -27,6 +27,7 @@ private List<ItemData> gearList;
 public String equippedGear;
 public Boolean isCostume;
 public String userSize;
+public String type;
 
 public void setGearList(List<ItemData> gearList) {
         this.gearList = gearList;
@@ -111,7 +112,11 @@ class GearViewHolder extends RecyclerView.ViewHolder implements View.OnClickList
         command.gear = this.gear;
         command.asCostume = isCostume;
         EventBus.getDefault().post(command);
-        equippedGear = this.gear.key;
+        if (this.gear.key.equals(equippedGear)) {
+            equippedGear = type + "_base_0";
+        } else {
+            equippedGear = this.gear.key;
+        }
         notifyDataSetChanged();
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
index 5f2399a04..332244c5d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
@@ -44,6 +44,7 @@ public class EquipmentDetailFragment extends BaseMainFragment {
         this.adapter.equippedGear = this.equippedGear;
         this.adapter.isCostume = this.isCostume;
         this.adapter.userSize = this.user.getPreferences().getSize();
+        this.adapter.type = this.type;
         this.recyclerView.setLayoutManager(new LinearLayoutManager(activity));
         this.recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));