diff --git a/templates/answerfile.j2 b/templates/answerfile.j2
index 956f9d69a627d3d4e2ee0c81cae9e0d2374747d8..ebfee14aea6dd542284201cb6e886fe67eb1a0dc 100644
--- a/templates/answerfile.j2
+++ b/templates/answerfile.j2
@@ -29,7 +29,7 @@ export DISK_DEVICES
 {%   if ifdata.ipv4 is defined %}
 {%     if hostobj.network.classes[ifdata.class].dhcp is defined %}
 {%       if hostobj.network.classes[ifdata.class].dhcp.ipv4 is defined %}
-{%         if (ifdata.ipv4 | ip_in_range('%s-%s' | format(hostobj.network.classes[ifdata.class].dhcp.ipv4.from, hostobj.network.classes[ifdata.class].dhcp.ipv4.to))) == true %}
+{%         if (ifdata.ipv4 | ip_in_range('%s-%s' | format(hostobj.network.classes[ifdata.class].dhcp.ipv4.from, hostobj.network.classes[ifdata.class].dhcp.ipv4.to))) == true and ifdata.static == False %}
 {%           set ifresdata.ipv4_address = "DHCP" %}
 {%         else %}
 {%           set ifresdata.ipv4_address = ifdata.ipv4 %}
@@ -50,7 +50,7 @@ export DISK_DEVICES
 {%   if ifdata.ipv6 is defined %}
 {%     if hostobj.network.classes[ifdata.class].dhcp is defined %}
 {%       if hostobj.network.classes[ifdata.class].dhcp.ipv6 is defined %}
-{%         if (ifdata.ipv6 | ip_in_range('%s-%s' | format(hostobj.network.classes[ifdata.class].dhcp.ipv6.from, hostobj.network.classes[ifdata.class].dhcp.ipv6.to))) == true %}
+{%         if (ifdata.ipv6 | ip_in_range('%s-%s' | format(hostobj.network.classes[ifdata.class].dhcp.ipv6.from, hostobj.network.classes[ifdata.class].dhcp.ipv6.to))) == true and ifdata.static == False %}
 {%           set ifresdata.ipv6_address = "DHCP" %}
 {%         else %}
 {%           set ifresdata.ipv6_address = ifdata.ipv6 %}