diff --git a/app/views/admin/contacts/partials/_address.haml b/app/views/admin/contacts/partials/_address.haml
index 9b6ec320c..c592966ae 100644
--- a/app/views/admin/contacts/partials/_address.haml
+++ b/app/views/admin/contacts/partials/_address.haml
@@ -2,26 +2,27 @@
   .panel-heading
     %h3.panel-title= t('shared.address')
   .panel-body
-    %dl.dl-horizontal
-      %dt= t('shared.country')
-      %dd= @contact.address.country
+    - unless @contact.address.nil?
+      %dl.dl-horizontal
+        %dt= t('shared.country')
+        %dd= @contact.address.country
 
-      %dt= t('shared.city')
-      %dd= @contact.address.city
+        %dt= t('shared.city')
+        %dd= @contact.address.city
 
-      %dt= t('shared.street')
-      %dd= @contact.address.street
-
-      - if @contact.address.street2
         %dt= t('shared.street')
-        %dd= @contact.address.street2
+        %dd= @contact.address.street
 
-      - if @contact.address.street3
-        %dt= t('shared.street')
-        %dd= @contact.address.street3
+        - if @contact.address.street2
+          %dt= t('shared.street')
+          %dd= @contact.address.street2
+
+        - if @contact.address.street3
+          %dt= t('shared.street')
+          %dd= @contact.address.street3
 
 
 
-      %dt= t('shared.zip')
-      %dd= @contact.address.zip
+        %dt= t('shared.zip')
+        %dd= @contact.address.zip