diff --git a/lib/vagrant/provisioners/chef_server.rb b/lib/vagrant/provisioners/chef_server.rb
index bc6a31853..a1e456682 100644
--- a/lib/vagrant/provisioners/chef_server.rb
+++ b/lib/vagrant/provisioners/chef_server.rb
@@ -23,7 +23,6 @@ module Vagrant
           @client_key_path = "/etc/chef/client.pem"
           @file_cache_path = "/srv/chef/file_store"
           @file_backup_path = "/srv/chef/cache"
-          @environment = "_default"
         end
 
         def validate(errors)
diff --git a/templates/chef_server_client.erb b/templates/chef_server_client.erb
index 6b48f6e84..5aadb7ceb 100644
--- a/templates/chef_server_client.erb
+++ b/templates/chef_server_client.erb
@@ -13,7 +13,7 @@ client_key             "<%= client_key %>"
 file_cache_path    "<%= file_cache_path %>"
 file_backup_path   "<%= file_backup_path %>"
 
-<% unless environment == "_default" %>
+<% unless environment.nil? %>
 environment        "<%= environment %>"
 <% end %>