diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/util/MapConverter.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/util/MapConverter.groovy
index ca0717ba68..c4a6eed44b 100644
--- a/accurest-core/src/main/groovy/io/codearte/accurest/util/MapConverter.groovy
+++ b/accurest-core/src/main/groovy/io/codearte/accurest/util/MapConverter.groovy
@@ -2,6 +2,7 @@ package io.codearte.accurest.util
 
 import groovy.json.JsonSlurper
 import io.codearte.accurest.dsl.internal.DslProperty
+import io.codearte.accurest.dsl.internal.Optional
 
 /**
  * @author Marcin Grzejszczak
@@ -40,6 +41,8 @@ class MapConverter {
 		return map.collectEntries {
 			key, value ->
 				[key, transformValues(value, closure)]
+		}.findAll {
+			!(it.value instanceof Optional)
 		}
 	}
 
diff --git a/accurest-core/src/test/groovy/io/codearte/accurest/builder/MockMvcSpockMethodBuilderSpec.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/builder/MockMvcSpockMethodBuilderSpec.groovy
index 2eb45c0475..f3ee4bd99a 100644
--- a/accurest-core/src/test/groovy/io/codearte/accurest/builder/MockMvcSpockMethodBuilderSpec.groovy
+++ b/accurest-core/src/test/groovy/io/codearte/accurest/builder/MockMvcSpockMethodBuilderSpec.groovy
@@ -552,6 +552,7 @@ class MockMvcSpockMethodBuilderSpec extends Specification implements WireMockStu
 			spockTest.contains('''$[?(@.message =~ /User not found by email = \\\\[[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\\\.[a-zA-Z]{2,4}\\\\]/)]''')
 	}
 
+	@Issue('42')
 	def "should omit an optional field from body resolution"() {
 		given:
 			GroovyDsl contractDsl = GroovyDsl.make {
@@ -591,6 +592,7 @@ class MockMvcSpockMethodBuilderSpec extends Specification implements WireMockStu
 			!spockTest.contains('''Optional''')
 	}
 
+	@Issue('42')
 	def "should omit an optional field from body resolution with GString"() {
 		given:
 			GroovyDsl contractDsl = GroovyDsl.make {
diff --git a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WireMockGroovyDslSpec.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WireMockGroovyDslSpec.groovy
index 053d33217b..cbceb49f80 100755
--- a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WireMockGroovyDslSpec.groovy
+++ b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WireMockGroovyDslSpec.groovy
@@ -1293,6 +1293,128 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie
 			stubMappingIsValidWireMockStub(wireMockStub)
 	}
 
+	@Issue('42')
+	def 'should generate stub without optional parameters with GString'() {
+		given:
+			GroovyDsl groovyDsl = GroovyDsl.make {
+				priority 1
+				request {
+					method 'POST'
+					url '/users/password'
+					headers {
+						header 'Content-Type': 'application/json'
+					}
+					body(
+							""" {
+								"email" : "${value(optional())}",
+								"callback_url" : "${value(client(regex(hostname())), server('http://partners.com'))}"
+								}
+							"""
+					)
+				}
+				response {
+					status 404
+					headers {
+						header 'Content-Type': 'application/json'
+					}
+					body(
+							""" {
+								"code" : "${value(optional())}",
+								"message" : "User not found by email = [${value(server(regex(email())), client('not.existing@user.com'))}]"
+								}
+							"""
+					)
+				}
+			}
+		when:
+			String wireMockStub = new WireMockStubStrategy(groovyDsl).toWireMockClientStub()
+		then:
+		AssertionUtil.assertThatJsonsAreEqual(('''
+			{
+	  "request" : {
+		"url" : "/users/password",
+		"method" : "POST",
+		"bodyPatterns" : [ {
+		  "matchesJsonPath" : "$[?(@.callback_url =~ /((http[s]?|ftp):\\\\/)\\\\/?([^:\\\\/\\\\s]+)(:[0-9]{1,5})?/)]"
+		} ],
+		"headers" : {
+		  "Content-Type" : {
+			"equalTo" : "application/json"
+		  }
+		}
+	  },
+	  "response" : {
+		"status" : 404,
+		"body" : "{\\"message\\":\\"User not found by email = [not.existing@user.com]\\"}",
+		"headers" : {
+		  "Content-Type" : "application/json"
+		}
+	  },
+	  "priority" : 1
+	}
+			'''), wireMockStub)
+		and:
+			stubMappingIsValidWireMockStub(wireMockStub)
+	}
+
+	@Issue('42')
+	def 'should generate stub without optional parameters'() {
+		given:
+			GroovyDsl groovyDsl = GroovyDsl.make {
+				priority 1
+				request {
+					method 'POST'
+					url '/users/password'
+					headers {
+						header 'Content-Type': 'application/json'
+					}
+					body(
+							email: optional(),
+							callback_url: $(client(regex(hostname())), server('http://partners.com'))
+					)
+				}
+				response {
+					status 404
+					headers {
+						header 'Content-Type': 'application/json'
+					}
+					body(
+							code: optional(),
+							message: "User not found by email = [${value(server(regex(email())), client('not.existing@user.com'))}]"
+					)
+				}
+			}
+		when:
+			String wireMockStub = new WireMockStubStrategy(groovyDsl).toWireMockClientStub()
+		then:
+		AssertionUtil.assertThatJsonsAreEqual(('''
+			{
+	  "request" : {
+		"url" : "/users/password",
+		"method" : "POST",
+		"bodyPatterns" : [ {
+		  "matchesJsonPath" : "$[?(@.callback_url =~ /((http[s]?|ftp):\\\\/)\\\\/?([^:\\\\/\\\\s]+)(:[0-9]{1,5})?/)]"
+		} ],
+		"headers" : {
+		  "Content-Type" : {
+			"equalTo" : "application/json"
+		  }
+		}
+	  },
+	  "response" : {
+		"status" : 404,
+		"body" : "{\\"message\\":\\"User not found by email = [not.existing@user.com]\\"}",
+		"headers" : {
+		  "Content-Type" : "application/json"
+		}
+	  },
+	  "priority" : 1
+	}
+			'''), wireMockStub)
+		and:
+			stubMappingIsValidWireMockStub(wireMockStub)
+	}
+
 	String toJsonString(value) {
 		new JsonBuilder(value).toPrettyString()
 	}