diff --git a/_includes/calendar-buttons.html b/_includes/calendar-buttons.html
index 816f74905eaaea..26d1e34989d93e 100644
--- a/_includes/calendar-buttons.html
+++ b/_includes/calendar-buttons.html
@@ -3,10 +3,9 @@
 {% assign eventurl = include.url | default: page.url | prepend: site.baseurl | prepend: site.url %}
 {% assign eventname = include.name | default: page.title | default: ""%}
 
-{% assign location = include.location | default: page.location %}
-
-{% if location %}
- {% assign location = location | format_location_simpler %}
+{% assign location = "unspecified" %}
+{% if include.location or page.location %}
+{% assign location = include.location | default: page.location | format_location_simple %}
 {% endif %}
 
 <a href="https://calendar.google.com/calendar/render?action=TEMPLATE&dates={{startdate | date: '%Y%m%d'}}%2F{{enddate | date: '%Y%m%d'}}&details=Event%20Information%20{{eventurl}}&location={{location}}&text={{eventname}}" class="btn btn-info btn-sm" alt="Add to Google Calendar">Google</a>