diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/JacksonJsonProvider.java b/modules/swagger-generator/src/main/java/io/swagger/generator/util/JacksonJsonProvider.java
new file mode 100644
index 00000000000..713ee2455c4
--- /dev/null
+++ b/modules/swagger-generator/src/main/java/io/swagger/generator/util/JacksonJsonProvider.java
@@ -0,0 +1,20 @@
+package io.swagger.generator.util;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import io.swagger.util.Json;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Produces({MediaType.APPLICATION_JSON})
+public class JacksonJsonProvider extends JacksonJaxbJsonProvider {
+    private static ObjectMapper commonMapper = Json.mapper();
+
+    public JacksonJsonProvider() {
+        super.setMapper(commonMapper);
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml b/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml
index a42631cd109..514cfab4435 100644
--- a/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml
+++ b/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml
@@ -17,6 +17,7 @@
             <param-name>jersey.config.server.provider.classnames</param-name>
             <param-value>
                 io.swagger.online.ExceptionWriter,
+                io.swagger.generator.util.JacksonJsonProvider,
                 io.swagger.jersey.listing.ApiListingResourceJSON,
                 io.swagger.jersey.listing.JerseyApiDeclarationProvider,
                 io.swagger.jersey.listing.JerseyResourceListingProvider