diff --git a/uber/models/attendee.py b/uber/models/attendee.py
index e941350dc..6ff13f880 100644
--- a/uber/models/attendee.py
+++ b/uber/models/attendee.py
@@ -1439,12 +1439,12 @@ def paid_for_a_shirt(self):
     @property
     def num_free_event_shirts(self):
         """
-        If someone is staff-shirt-eligible, we use the number of event shirts they have selected (if any)
-        Volunteers also get a free event shirt.
+        If someone is staff-shirt-eligible, we use the number of event shirts they have selected (if any).
+        Volunteers also get a free event shirt. Staff get an event shirt if staff shirts are turned off for the event.
         Returns: Integer representing the number of free event shirts this attendee should get.
-
         """
-        return max(0, self.num_event_shirts) if self.gets_staff_shirt else self.volunteer_event_shirt_eligible
+        return max(0, self.num_event_shirts) if self.gets_staff_shirt else bool(
+            self.volunteer_event_shirt_eligible or (self.badge_type == c.STAFF_BADGE and c.HOURS_FOR_SHIRT))
 
     @property
     def volunteer_event_shirt_eligible(self):
diff --git a/uber/templates/forms/attendee/badge_extras.html b/uber/templates/forms/attendee/badge_extras.html
index 3d1c650a0..12950b89a 100644
--- a/uber/templates/forms/attendee/badge_extras.html
+++ b/uber/templates/forms/attendee/badge_extras.html
@@ -57,7 +57,7 @@
     <div class="row g-sm-3">
         <div class="col-12 col-sm-6">
             <div class="form-text">{{ badge_extras.amount_extra.label.text }}</div>
-            <div class="form-control-plaintext h5">{{ attendee.amount_extra_label }}{% if c.AVAILABLE_MERCH_TIERS and attendee.amount_extra < c.AVAILABLE_MERCH_TIERS[-1] %}{{ macros.upgrade_button('amount-extra', text="Purchase Merch" if attendee.amount_extra == 0 else "Upgrade") }}{% endif %}</div>
+            <div class="form-control-plaintext h5">{{ attendee.amount_extra_label or "None" }}{% if c.AVAILABLE_MERCH_TIERS and attendee.amount_extra < c.AVAILABLE_MERCH_TIERS[-1] %}{{ macros.upgrade_button('amount-extra', text="Purchase Merch" if attendee.amount_extra == 0 else "Upgrade") }}{% endif %}</div>
         </div>
     </div>
 {% endif %}