diff --git a/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/models/v1/datalayer/ComponentDataImpl.java b/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/models/v1/datalayer/ComponentDataImpl.java
index fc2051aa35..da6b0e36f0 100644
--- a/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/models/v1/datalayer/ComponentDataImpl.java
+++ b/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/internal/models/v1/datalayer/ComponentDataImpl.java
@@ -15,13 +15,11 @@
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 package com.adobe.cq.wcm.core.components.internal.models.v1.datalayer;
 
-import com.adobe.cq.wcm.core.components.internal.jackson.ComponentDataModelSerializer;
 import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
 import com.adobe.cq.wcm.core.components.models.datalayer.builder.DataLayerSupplier;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.module.SimpleModule;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -43,9 +41,7 @@ public class ComponentDataImpl implements ComponentData {
     /**
      * The {@link ObjectWriter} used for JSON serialization. We can safely re-use the instance since it's thread-safe.
      */
-    private static final ObjectWriter OBJECT_WRITER = new ObjectMapper().registerModule(
-        new SimpleModule().addSerializer(ComponentData.class, new ComponentDataModelSerializer())
-    ).writer();
+    private static final ObjectWriter OBJECT_WRITER = new ObjectMapper().writer();
 
     /**
      * The current data layer supplier.
diff --git a/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/Utils.java b/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/Utils.java
index 58541c0515..886390f02d 100644
--- a/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/Utils.java
+++ b/bundles/core/src/test/java/com/adobe/cq/wcm/core/components/Utils.java
@@ -27,7 +27,9 @@
 import javax.json.JsonReader;
 import javax.json.JsonStructure;
 
+import com.adobe.cq.wcm.core.components.internal.jackson.ComponentDataModelSerializer;
 import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.sling.api.resource.Resource;
@@ -63,6 +65,7 @@ public static void testJSONExport(Object model, String expectedJsonResource) {
         mapper.registerModule(pageModuleProvider.getModule());
         DefaultMethodSkippingModuleProvider defaultMethodSkippingModuleProvider = new DefaultMethodSkippingModuleProvider();
         mapper.registerModule(defaultMethodSkippingModuleProvider.getModule());
+        mapper.registerModule(new SimpleModule().addSerializer(ComponentData.class, new ComponentDataModelSerializer()));
         try {
             mapper.writer().writeValue(writer, model);
         } catch (IOException e) {