diff --git a/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt b/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt
index 545e2446..2b26e009 100644
--- a/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt
+++ b/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt
@@ -81,8 +81,12 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver
                     null
                 }
 
-                if (value == null && isOptional && environment.containsArgument(definition.name)) {
-                    return@add Optional.empty<Any>()
+                if (value == null && isOptional) {
+                    if (environment.containsArgument(definition.name)) {
+                        return@add Optional.empty<Any>()
+                    } else {
+                        return@add null;
+                    }
                 }
 
                 return@add mapper.convertValue(value, typeReference)