diff --git a/themes/positive/src/partials/education.hbs b/themes/positive/src/partials/education.hbs
index fc64252..5c5b35f 100644
--- a/themes/positive/src/partials/education.hbs
+++ b/themes/positive/src/partials/education.hbs
@@ -9,7 +9,7 @@
     <div>
       <h3>{{#if title}}<em>{{{ title }}}</em>, {{/if}}{{{ institution }}}</h3>
       <span class="tenure">{{dateRange .}}</span>
-      <span class="location">{{location}}</span>
+      {{#if location}}<span class="location">{{location}}</span>{{/if}}
       {{{ summary }}}
       {{> highlights }}
       {{#if curriculum}}<span class="keywords">{{#each curriculum}}{{{ . }}} {{/each}}</span>{{/if}}
diff --git a/themes/positive/src/partials/employment.hbs b/themes/positive/src/partials/employment.hbs
index 5f6d8d8..a75afb1 100644
--- a/themes/positive/src/partials/employment.hbs
+++ b/themes/positive/src/partials/employment.hbs
@@ -14,8 +14,8 @@
         {{ employer }}
         {{/if}}
         </h3>
-        <span class="tenure">{{dateRange .}}</span>        
-        <span class="location">{{location}}</span>
+        <span class="tenure">{{dateRange .}}</span>
+        {{#if location}}<span class="location">{{location}}</span>{{/if}}
       <p>{{{ summary }}}</p>
       {{> highlights }}
       {{#if keywords}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>{{/if}}
diff --git a/themes/positive/src/partials/service.hbs b/themes/positive/src/partials/service.hbs
index 727daa6..3c4b1c6 100644
--- a/themes/positive/src/partials/service.hbs
+++ b/themes/positive/src/partials/service.hbs
@@ -15,7 +15,7 @@
       {{/if}}
     </h3>
     <span class="tenure">{{dateRange .}}</span>
-    <span class="location">{{location}}</span>
+    {{#if location}}<span class="location">{{location}}</span>{{/if}}
     <p>{{{ summary }}}</p>
     {{> highlights }}
     </div>