diff --git a/uber/templates/hotel_requests/hotel_item.html b/uber/templates/hotel_requests/hotel_item.html
index d90115a4b..aba7b6958 100644
--- a/uber/templates/hotel_requests/hotel_item.html
+++ b/uber/templates/hotel_requests/hotel_item.html
@@ -15,7 +15,7 @@
     {% if c.BEFORE_ROOM_DEADLINE %}
         <li>
             {{ macros.checklist_image(attendee.hotel_requests) }}
-            {% if not attendee.placeholder and attendee.food_restrictions_filled_out and attendee.shirt_info_marked and not attendee.hotel_requests %}
+            {% if not attendee.placeholder and attendee.food_restrictions_filled_out and not attendee.hotel_requests %}
                 <a href="../hotel_requests">Tell us</a>
             {% else %}
                 Tell us
diff --git a/uber/templates/signups/food_item.html b/uber/templates/signups/food_item.html
index 2dccd0662..d642f4953 100644
--- a/uber/templates/signups/food_item.html
+++ b/uber/templates/signups/food_item.html
@@ -2,7 +2,7 @@
 
 <li>
     {{ macros.checklist_image(attendee.food_restrictions) }}
-    {% if not attendee.placeholder and attendee.shirt_info_marked %}
+    {% if not attendee.placeholder %}
         <a href="food_restrictions">Let us know</a>
     {% else %}
         Let us know
diff --git a/uber/templates/signups/shirt_item.html b/uber/templates/signups/shirt_item.html
index a12987b95..f3099087c 100644
--- a/uber/templates/signups/shirt_item.html
+++ b/uber/templates/signups/shirt_item.html
@@ -2,7 +2,7 @@
 
 <li>
     {{ macros.checklist_image(attendee.shirt_info_marked) }}
-    {% if not attendee.placeholder %}
+    {% if not attendee.placeholder and attendee.food_restrictions_filled_out and (not self.hotel_eligible or self.hotel_requests or not c.BEFORE_ROOM_DEADLINE) %}
         <a href="shirt_size">Let us know</a>
     {% else %}
         Let us know