diff --git a/_includes/footer.html b/_includes/footer.html
index 33083ba..bd51e10 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -40,9 +40,23 @@
 				<div class="contact-method">
 					<span class="icon alt fa-home"></span>
 					<h3>Address</h3>
-					<span>{{ site.street_address }}<br />
-					{{ site.city }}, {{ site.state }} {{ site.zip_code }}<br />
-					{{ site.country }}</span>
+					<span>
+					{% if site.street_address %}
+					    {{ site.street_address }}<br />
+					{% endif %}
+					{% if site.city %}
+					    {{ site.city }},
+					{% endif %}
+					{% if site.state %}
+					    {{ site.state }} 
+					{% endif %}
+					{% if site.zip_code %}
+					    {{ site.zip_code }<br />
+					{% endif %}}
+					{% if site.country %}
+					    {{ site.country }}
+					{% endif %}
+					</span>
 				</div>
 			</section>
 		</section>