diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go
index c0819b89b..882d4fa9d 100644
--- a/provisioner/puppet-masterless/provisioner.go
+++ b/provisioner/puppet-masterless/provisioner.go
@@ -90,7 +90,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{
 			`{{if ne .ModulePath ""}}--modulepath='{{.ModulePath}}' {{end}}` +
 			`{{if ne .HieraConfigPath ""}}--hiera_config='{{.HieraConfigPath}}' {{end}}` +
 			`{{if ne .ManifestDir ""}}--manifestdir='{{.ManifestDir}}' {{end}}` +
-			"{{.ExtraArguments}} " +
+			`{{if ne .ExtraArguments ""}}{{.ExtraArguments}} {{end}}` +
 			"{{.ManifestFile}}",
 		facterVarsFmt:    "FACTER_%s='%s'",
 		facterVarsJoiner: " ",
@@ -107,7 +107,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{
 			`{{if ne .ModulePath ""}}--modulepath='{{.ModulePath}}' {{end}}` +
 			`{{if ne .HieraConfigPath ""}}--hiera_config='{{.HieraConfigPath}}' {{end}}` +
 			`{{if ne .ManifestDir ""}}--manifestdir='{{.ManifestDir}}' {{end}}` +
-			"{{.ExtraArguments}} " +
+			`{{if ne .ExtraArguments ""}}{{.ExtraArguments}} {{end}}` +
 			"{{.ManifestFile}}",
 		facterVarsFmt:    `SET "FACTER_%s=%s"`,
 		facterVarsJoiner: " & ",
diff --git a/provisioner/puppet-server/provisioner.go b/provisioner/puppet-server/provisioner.go
index 2118bd60e..b7ec34ea7 100644
--- a/provisioner/puppet-server/provisioner.go
+++ b/provisioner/puppet-server/provisioner.go
@@ -88,7 +88,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{
 			`{{if ne .PuppetNode ""}}--certname='{{.PuppetNode}}' {{end}}` +
 			`{{if ne .ClientCertPath ""}}--certdir='{{.ClientCertPath}}' {{end}}` +
 			`{{if ne .ClientPrivateKeyPath ""}}--privatekeydir='{{.ClientPrivateKeyPath}}' {{end}}` +
-			"{{.ExtraArguments}} ",
+			`{{if ne .ExtraArguments ""}}{{.ExtraArguments}} {{end}}`,
 		facterVarsFmt:    "FACTER_%s='%s'",
 		facterVarsJoiner: " ",
 	},
@@ -104,7 +104,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{
 			`{{if ne .PuppetNode ""}}--certname='{{.PuppetNode}}' {{end}}` +
 			`{{if ne .ClientCertPath ""}}--certdir='{{.ClientCertPath}}' {{end}}` +
 			`{{if ne .ClientPrivateKeyPath ""}}--privatekeydir='{{.ClientPrivateKeyPath}}' {{end}}` +
-			"{{.ExtraArguments}} ",
+			`{{if ne .ExtraArguments ""}}{{.ExtraArguments}} {{end}}`,
 		facterVarsFmt:    `SET "FACTER_%s=%s"`,
 		facterVarsJoiner: " & ",
 	},
diff --git a/website/source/docs/provisioners/puppet-masterless.html.md b/website/source/docs/provisioners/puppet-masterless.html.md
index 448a2e880..341bf3867 100644
--- a/website/source/docs/provisioners/puppet-masterless.html.md
+++ b/website/source/docs/provisioners/puppet-masterless.html.md
@@ -140,7 +140,7 @@ cd {{.WorkingDir}} &&
 	{{if ne .ModulePath ""}}--modulepath='{{.ModulePath}}' {{end}}
 	{{if ne .HieraConfigPath ""}}--hiera_config='{{.HieraConfigPath}}' {{end}}
 	{{if ne .ManifestDir ""}}--manifestdir='{{.ManifestDir}}' {{end}}
-	{{.ExtraArguments}}
+	{{if ne .ExtraArguments ""}}{{.ExtraArguments}} {{end}}
 	{{.ManifestFile}}
 ```
 
@@ -155,7 +155,7 @@ cd {{.WorkingDir}} &&
 	{{if ne .ModulePath ""}}--modulepath='{{.ModulePath}}' {{end}}
 	{{if ne .HieraConfigPath ""}}--hiera_config='{{.HieraConfigPath}}' {{end}}
 	{{if ne .ManifestDir ""}}--manifestdir='{{.ManifestDir}}' {{end}}
-	{{.ExtraArguments}}
+	{{if ne .ExtraArguments ""}}{{.ExtraArguments}} {{end}}
 	{{.ManifestFile}}
 ```
 
diff --git a/website/source/docs/provisioners/puppet-server.html.md b/website/source/docs/provisioners/puppet-server.html.md
index af09b9ace..98043675d 100644
--- a/website/source/docs/provisioners/puppet-server.html.md
+++ b/website/source/docs/provisioners/puppet-server.html.md
@@ -119,7 +119,7 @@ cd {{.WorkingDir}} &&
 	{{if ne .PuppetNode ""}}--certname='{{.PuppetNode}}' {{end}}
 	{{if ne .ClientCertPath ""}}--certdir='{{.ClientCertPath}}' {{end}}
 	{{if ne .ClientPrivateKeyPath ""}}--privatekeydir='{{.ClientPrivateKeyPath}}' {{end}}
-	"{{.ExtraArguments}} "
+	{{if ne .ExtraArguments ""}}{{.ExtraArguments}} {{end}}
 ```
 
 The following command is used if guest OS type is windows:
@@ -134,7 +134,7 @@ cd {{.WorkingDir}} &&
 	{{if ne .PuppetNode ""}}--certname='{{.PuppetNode}}' {{end}}
 	{{if ne .ClientCertPath ""}}--certdir='{{.ClientCertPath}}' {{end}}
 	{{if ne .ClientPrivateKeyPath ""}}--privatekeydir='{{.ClientPrivateKeyPath}}' {{end}}
-	"{{.ExtraArguments}} "
+	{{if ne .ExtraArguments ""}}{{.ExtraArguments}} {{end}}
 ```
 
 ## Default Facts