diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
index b49834e9281..dd62ad51045 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
@@ -109,7 +109,8 @@ public class JacksonAutoConfiguration {
 		@ConditionalOnMissingBean(Jackson2ObjectMapperBuilder.class)
 		public Jackson2ObjectMapperBuilder jacksonObjectMapperBuilder() {
 			Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder();
-			if (this.httpMapperProperties.isJsonSortKeys()) {
+			Boolean isJsonSortKeys = this.httpMapperProperties.isJsonSortKeys();
+			if (isJsonSortKeys != null && isJsonSortKeys) {
 				builder.featuresToEnable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
 			}
 			configureFeatures(builder, this.jacksonProperties.getDeserialization());
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java
index a42188ec35c..c6b3849fc05 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMapperProperties.java
@@ -24,27 +24,28 @@ import org.springframework.http.converter.HttpMessageConverter;
  *
  * @author Dave Syer
  * @author Piotr Maj
+ * @author Sebastien Deleuze
  */
 @ConfigurationProperties(prefix = "http.mappers", ignoreUnknownFields = false)
 public class HttpMapperProperties {
 
-	private boolean jsonPrettyPrint;
+	private Boolean jsonPrettyPrint;
 
-	private boolean jsonSortKeys;
+	private Boolean jsonSortKeys;
 
-	public void setJsonPrettyPrint(boolean jsonPrettyPrint) {
+	public void setJsonPrettyPrint(Boolean jsonPrettyPrint) {
 		this.jsonPrettyPrint = jsonPrettyPrint;
 	}
 
-	public boolean isJsonPrettyPrint() {
+	public Boolean isJsonPrettyPrint() {
 		return this.jsonPrettyPrint;
 	}
 
-	public void setJsonSortKeys(boolean jsonSortKeys) {
+	public void setJsonSortKeys(Boolean jsonSortKeys) {
 		this.jsonSortKeys = jsonSortKeys;
 	}
 
-	public boolean isJsonSortKeys() {
+	public Boolean isJsonSortKeys() {
 		return this.jsonSortKeys;
 	}
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java
index b7d8884fac5..42146b7e575 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java
@@ -78,7 +78,9 @@ public class HttpMessageConvertersAutoConfiguration {
 				ObjectMapper objectMapper) {
 			MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
 			converter.setObjectMapper(objectMapper);
-			converter.setPrettyPrint(this.properties.isJsonPrettyPrint());
+			if (this.properties.isJsonPrettyPrint() != null) {
+				converter.setPrettyPrint(this.properties.isJsonPrettyPrint());
+			}
 			return converter;
 		}
 
@@ -99,7 +101,9 @@ public class HttpMessageConvertersAutoConfiguration {
 				Jackson2ObjectMapperBuilder builder) {
 			MappingJackson2XmlHttpMessageConverter converter = new MappingJackson2XmlHttpMessageConverter();
 			converter.setObjectMapper(builder.createXmlMapper(true).build());
-			converter.setPrettyPrint(this.properties.isJsonPrettyPrint());
+			if (this.properties.isJsonPrettyPrint() != null) {
+				converter.setPrettyPrint(this.properties.isJsonPrettyPrint());
+			}
 			return converter;
 		}