diff --git a/pillar/global/map.jinja b/pillar/global/map.jinja
index b5d15dc..c0fff69 100644
--- a/pillar/global/map.jinja
+++ b/pillar/global/map.jinja
@@ -18,6 +18,7 @@
 {%- if minion in interfaces -%}{%- for interface, ifconfig in interfaces[minion].items() -%}
 {%- if not interface.startswith(excluded_interfaces) -%}
 
+{%- if 'inet' in ifconfig -%}
 {%- for inetconf in ifconfig['inet'] -%}
 {%- set ip4 = inetconf['address'] -%}
 
@@ -42,8 +43,9 @@
 {%- endif %}
 
 {%- endfor %}
+{%- endif %}
 
-{%- if 'inet6' in interface -%}
+{%- if 'inet6' in ifconfig -%}
 {%- for inet6conf in ifconfig['inet6'] -%}
 {%- set ip6 = inet6conf['address'] -%}