diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 4419f1e1f..6e1e1f0d7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -364,7 +364,7 @@ public final class DefaultTypeManager implements TypeManager {
         return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT);
       }
     }
-    if (objectMapperPresent) {
+    if (objectMapperPresent && prop.getMutationDetection() == MutationDetection.DEFAULT) {
       if (type.equals(JsonNode.class)) {
         switch (dbType) {
           case Types.VARCHAR:
diff --git a/ebean-core/src/test/java/org/tests/json/TestOldValue.java b/ebean-core/src/test/java/org/tests/json/TestOldValue.java
index dec8a9f05..f7bd391e5 100644
--- a/ebean-core/src/test/java/org/tests/json/TestOldValue.java
+++ b/ebean-core/src/test/java/org/tests/json/TestOldValue.java
@@ -3,32 +3,19 @@ package org.tests.json;
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.ValuePair;
-import io.ebean.annotation.ForPlatform;
-import io.ebean.annotation.Platform;
-import io.ebean.text.TextException;
 
 import org.assertj.core.api.SoftAssertions;
-import org.ebeantest.LoggedSqlCollector;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.tests.model.json.EBasicJsonList;
 import org.tests.model.json.EBasicOldValue;
-import org.tests.model.json.PlainBean;
 
-import javax.persistence.PersistenceException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 public class TestOldValue extends BaseTestCase {
 
   
@@ -37,6 +24,7 @@ public class TestOldValue extends BaseTestCase {
   @Test
   public void testDbJsonOldValue() throws Exception {
     EBasicOldValue bean = new EBasicOldValue();
+    JsonNodeFactory jnf = new JsonNodeFactory(false);
 
     bean.getStringList().add("sl1");
     bean.getStringSet().add("ss1");
@@ -47,7 +35,9 @@ public class TestOldValue extends BaseTestCase {
     bean.getIntList().add(2);
     bean.getIntSet().add(1002);
     bean.getIntMap().put("ik1",2002);
-
+    
+    bean.setJsonNode(jnf.arrayNode().add("Foo"));
+    
     DB.save(bean);
     bean = DB.find(EBasicOldValue.class, bean.getId());
 
@@ -60,11 +50,11 @@ public class TestOldValue extends BaseTestCase {
     bean.getIntList().add(6);
     bean.getIntSet().add(1006);
     bean.getIntMap().put("ik2",2006);
-
+    ((ArrayNode)bean.getJsonNode()).add("Bar");
     
     Map<String, ValuePair> dirty = DB.getBeanState(bean).getDirtyValues();
     SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(dirty).hasSize(9);
+    softly.assertThat(dirty).hasSize(10);
 
     softly.assertThat((List)dirty.get("stringList").getOldValue()).containsExactly("sl1");
     softly.assertThat((List)dirty.get("stringList").getNewValue()).containsExactly("sl1", "sl2");
@@ -87,6 +77,9 @@ public class TestOldValue extends BaseTestCase {
     softly.assertThat((Map)dirty.get("intMap").getOldValue()).containsEntry("ik1",2002).hasSize(1);
     softly.assertThat((Map)dirty.get("intMap").getNewValue()).containsEntry("ik1",2002).containsEntry("ik2",2006).hasSize(2);
 
+    softly.assertThat((ArrayNode)dirty.get("jsonNode").getOldValue()).hasToString("[\"Foo\"]");
+    softly.assertThat((ArrayNode)dirty.get("jsonNode").getNewValue()).hasToString("[\"Foo\",\"Bar\"]");
+
     softly.assertAll();
 
   }
diff --git a/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java b/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java
index 27a086ad5..37e805412 100644
--- a/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java
+++ b/ebean-core/src/test/java/org/tests/model/json/EBasicOldValue.java
@@ -5,6 +5,9 @@ import io.ebean.annotation.DbJson;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
 import java.util.*;
 
 import static io.ebean.annotation.MutationDetection.SOURCE;
@@ -44,9 +47,13 @@ public class EBasicOldValue {
   @DbJson(mutationDetection = SOURCE)
   Map<String, Integer> intMap = new LinkedHashMap<>();
 
+  @DbJson(mutationDetection = SOURCE)
+  JsonNode jsonNode;
+  
   @DbArray()
   List<String> stringArr = new ArrayList<>();
   
+  
   public Long getId() {
     return id;
   }
@@ -135,6 +142,14 @@ public class EBasicOldValue {
     this.intMap = intMap;
   }
   
+  public JsonNode getJsonNode() {
+    return jsonNode;
+  }
+  
+  public void setJsonNode(JsonNode jsonNode) {
+    this.jsonNode = jsonNode;
+  }
+  
   public List<String> getStringArr() {
     return stringArr;
   }