diff --git a/munin/manifests/init.pp b/munin/manifests/init.pp
index 5c13aff..fc49631 100644
--- a/munin/manifests/init.pp
+++ b/munin/manifests/init.pp
@@ -61,7 +61,10 @@ class munin::node {
 
     @@file { "/etc/munin/conf.d/${homename}.conf":
         ensure  => present,
-        content => "[${homename}]\n  address ${ipaddress}\n  use_node_name yes\n",
+        content => $::ec2_public_ipv4 ? {
+            ""      => "[${homename}]\n  address ${ipaddress}\n  use_node_name yes\n",
+            default => "[${homename}]\n  address ${ec2_public_ipv4}\n  use_node_name yes\n",
+        },
         tag     => "munin",
     }