diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index c5d40aed1..6cba30562 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1381,7 +1381,8 @@
     <string name="equipment_class_locked">This equipment is class-locked</string>
     <string name="change_class_to_x">Change class to %s</string>
     <string name="shop_armoire_title">You own all %s gear</string>
-    <string name="shop_armoire_description">New gear is released during the seasonal Galas. The Enchanted Armoire gets new stock every month too!</string>
+    <string name="shop_armoire_description">New gear is released during the seasonal Galas. Until then, theres %d pieces of gear in the Enchanted Armoire to find!</string>
+    <string name="shop_armoire_empty_description">New gear is released during the seasonal Galas. The Enchanted Armoire gets new stock every month too!</string>
     <string name="unlock_gear_and_skills">Unlock %s gear and skills</string>
 
     <plurals name="you_x_others">
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
index d36dcd2a1..ce6070acd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
@@ -288,9 +288,15 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<Vi
 
         fun bind(className: String, armoireCount: Int) {
             binding.titleView.text = itemView.context.getString(R.string.shop_armoire_title, className)
-            binding.descriptionView.text = itemView.context.getString(R.string.shop_armoire_description)
-            binding.iconView.visibility = View.GONE
-            binding.footerLayout.visibility = View.INVISIBLE
+            if (armoireCount > 0) {
+                binding.descriptionView.text = itemView.context.getString(R.string.shop_armoire_description, armoireCount)
+                binding.footerLayout.visibility = View.VISIBLE
+                binding.iconView.visibility = View.VISIBLE
+            } else {
+                binding.descriptionView.text = itemView.context.getString(R.string.shop_armoire_empty_description)
+                binding.footerLayout.visibility = View.INVISIBLE
+                binding.iconView.visibility = View.GONE
+            }
         }
     }
 }