diff --git a/installer_puppet/dhcp/manifests/pool.pp b/installer_puppet/dhcp/manifests/pool.pp
index c64c9754..b3263f9b 100644
--- a/installer_puppet/dhcp/manifests/pool.pp
+++ b/installer_puppet/dhcp/manifests/pool.pp
@@ -2,7 +2,7 @@
     $network,
     $mask,
     $range = false,
-    $gateway
+    $gateway = false
   ) {
 
     include dhcp::params
diff --git a/installer_puppet/dhcp/templates/dhcpd.pool.erb b/installer_puppet/dhcp/templates/dhcpd.pool.erb
index 4b643d91..4b926e1f 100644
--- a/installer_puppet/dhcp/templates/dhcpd.pool.erb
+++ b/installer_puppet/dhcp/templates/dhcpd.pool.erb
@@ -10,6 +10,8 @@ subnet <%= network %> netmask <%= mask %> {
 <% end -%>
 
   option subnet-mask <%= mask %>;
+<% if gateway -%>
   option routers <%= gateway %>;
+<% end -%>
 }