diff --git a/src/main/java/com/avaje/ebean/config/DocStoreConfig.java b/src/main/java/com/avaje/ebean/config/DocStoreConfig.java
index 8bfb2264d..ec23cb2d8 100644
--- a/src/main/java/com/avaje/ebean/config/DocStoreConfig.java
+++ b/src/main/java/com/avaje/ebean/config/DocStoreConfig.java
@@ -32,6 +32,21 @@ public class DocStoreConfig {
    */
   protected int bulkBatchSize = 1000;
 
+  /**
+   * Resource path for the Document store mapping files.
+   */
+  protected String mappingPath;
+
+  /**
+   * Suffix used for mapping files.
+   */
+  protected String mappingSuffix;
+
+  /**
+   * Location of resources that mapping files are generated into.
+   */
+  protected String pathToResources = "src/main/resources";
+
   /**
    * Return true if the Document store (ElasticSearch) integration is active.
    */
@@ -102,6 +117,47 @@ public class DocStoreConfig {
     this.bulkBatchSize = bulkBatchSize;
   }
 
+  /**
+   * Return the mapping path.
+   */
+  public String getMappingPath() {
+    return mappingPath;
+  }
+
+  /**
+   * Set the mapping path.
+   */
+  public void setMappingPath(String mappingPath) {
+    this.mappingPath = mappingPath;
+  }
+
+  /**
+   * Return the mapping suffix.
+   */
+  public String getMappingSuffix() {
+    return mappingSuffix;
+  }
+
+  /**
+   * Set the mapping suffix.
+   */
+  public void setMappingSuffix(String mappingSuffix) {
+    this.mappingSuffix = mappingSuffix;
+  }
+
+  /**
+   * Return the relative file system path to resources when generating mapping files.
+   */
+  public String getPathToResources() {
+    return pathToResources;
+  }
+
+  /**
+   * Set the relative file system path to resources when generating mapping files.
+   */
+  public void setPathToResources(String pathToResources) {
+    this.pathToResources = pathToResources;
+  }
 
   /**
    * Return the default behavior for when Insert, Update and Delete events occur on beans that have an associated
@@ -143,5 +199,8 @@ public class DocStoreConfig {
     persist = properties.getEnum(DocStoreEvent.class, "docstore.persist", persist);
     bulkBatchSize = properties.getInt("docstore.bulkBatchSize", bulkBatchSize);
     dropCreate = properties.getBoolean("docstore.dropCreate", dropCreate);
+    mappingPath = properties.get("docstore.mappingPath", mappingPath);
+    mappingSuffix = properties.get("docstore.mappingSuffix", mappingSuffix);
+    pathToResources = properties.get("docstore.pathToResources", pathToResources);
   }
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
index ea48ce575..1068509b1 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
@@ -1368,6 +1368,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   public <T> void findEachWhile(Query<T> query, QueryEachWhileConsumer<T> consumer, Transaction t) {
 
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, t);
+    if (request.isUseDocStore()) {
+      docStore().findEachWhile(query, consumer);
+      return;
+    }
 
     request.initTransIfRequired();
     request.findEachWhile(consumer);