diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java
index 332533a25..91be1e4d8 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java
@@ -1386,12 +1386,12 @@ public class BeanProperty implements ElPropertyValue, Property {
   public void docStoreMapping(DocMappingBuilder mapping, String prefix) {
 
     if (mapping.includesProperty(prefix, name)) {
-
       DocPropertyType type = scalarType.getDocType();
-      if (isKeywordType(type, docOptions)) {
+      DocPropertyOptions options = docOptions.copy();
+      if (isKeywordType(type, options)) {
         type = DocPropertyType.KEYWORD;
       }
-      mapping.add(new DocPropertyMapping(name, type, docOptions));
+      mapping.add(new DocPropertyMapping(name, type, options));
     }
   }