diff --git a/templates/chef_server_client.erb b/templates/chef_server_client.erb
index 94fd11965..eb5e38f5f 100644
--- a/templates/chef_server_client.erb
+++ b/templates/chef_server_client.erb
@@ -1,6 +1,8 @@
 log_level          <%= log_level.inspect %>
 log_location       STDOUT
+<% if node_name %>
 node_name          "<%= node_name %>"
+<% end %>
 ssl_verify_mode    :verify_none
 chef_server_url    "<%= chef_server_url %>"
 
diff --git a/templates/chef_solo_solo.erb b/templates/chef_solo_solo.erb
index 80124ced5..d1936b490 100644
--- a/templates/chef_solo_solo.erb
+++ b/templates/chef_solo_solo.erb
@@ -1,4 +1,6 @@
+<% if node_name %>
 node_name "<%= node_name %>"
+<% end %>
 file_cache_path "<%= provisioning_path %>"
 cookbook_path <%= cookbooks_path %>
 role_path <%= roles_path %>