diff --git a/ietf/proceedings/models.py b/ietf/proceedings/models.py
index 17ac29dea..a0e210aa6 100644
--- a/ietf/proceedings/models.py
+++ b/ietf/proceedings/models.py
@@ -141,6 +141,7 @@ class NonSession(models.Model):
     non_session_ref = models.ForeignKey(NonSessionRef)
     meeting = models.ForeignKey(Meeting, db_column='meeting_num')
     time_desc = models.CharField(blank=True, maxlength=75)
+    show_break_location = models.BooleanField()
     def __str__(self):
 	if self.day_id:
 	    return "%s %s %s @%d" % ((self.meeting.start_date + datetime.timedelta(self.day_id)).strftime('%A'), self.time_desc, self.non_session_ref, self.meeting_id)
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index cc9e7d3d6..567456013 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -36,7 +36,7 @@ IETF agendas are subject to change, up to and during the meeting.<br />
 	 <td colspan="4">
 	    <br />
 	    {{ slot.break_info.time_desc }}  {{ slot.break_info.name }}
-	    {% if venue.break_area_name %} - <a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{ venue.break_area_name|slugify }}">{{ venue.break_area_name }}</a>{% endif %}
+	    {% if venue.break_area_name and slot.break_info.show_break_location %} - <a href="http://tools.ietf.org/agenda/{{meeting.num}}/venue/?room={{ venue.break_area_name|slugify }}">{{ venue.break_area_name }}</a>{% endif %}
 	 </td>
       </tr>
       {% endif %}