diff --git a/plugins/provisioners/puppet/config/puppet_server.rb b/plugins/provisioners/puppet/config/puppet_server.rb
index 967bf4c4d..3dc5b5d59 100644
--- a/plugins/provisioners/puppet/config/puppet_server.rb
+++ b/plugins/provisioners/puppet/config/puppet_server.rb
@@ -7,9 +7,21 @@ module VagrantPlugins
         attr_accessor :options
         attr_accessor :facter
 
-        def facter; @facter ||= {}; end
-        def puppet_server; @puppet_server || "puppet"; end
-        def options; @options ||= []; end
+        def initialize
+          super
+
+          @facter        = {}
+          @options       = []
+          @puppet_node   = UNSET_VALUE
+          @puppet_server = UNSET_VALUE
+        end
+
+        def finalize!
+          super
+
+          @puppet_node   = nil if @puppet_node == UNSET_VALUE
+          @puppet_server = "puppet" if @puppet_server == UNSET_VALUE
+        end
       end
     end
   end