diff --git a/README.md b/README.md
index f3927b2..9f015be 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,9 @@ Just add it to your dependency then you can use the slf4j module in your applica
 
 ### Latest changes
 
+##### unreleased
+* Add option for Fluency appender: `jvmHeapBufferMode`
+
 ##### Version 1.8.4
 
 * Avoid CloudWatch request limit error
diff --git a/src/main/java/ch/qos/logback/more/appenders/FluencyLogbackAppender.java b/src/main/java/ch/qos/logback/more/appenders/FluencyLogbackAppender.java
index 3c9a324..1790981 100644
--- a/src/main/java/ch/qos/logback/more/appenders/FluencyLogbackAppender.java
+++ b/src/main/java/ch/qos/logback/more/appenders/FluencyLogbackAppender.java
@@ -105,6 +105,7 @@ public void stop() {
     private Integer flushAttemptIntervalMillis;
     private Integer senderMaxRetryCount;
     private boolean sslEnabled;
+    private Boolean jvmHeapBufferMode;
 
     public RemoteServers getRemoteServers() {
         return remoteServers;
@@ -218,6 +219,14 @@ public void setSenderMaxRetryCount(Integer senderMaxRetryCount) {
         this.senderMaxRetryCount = senderMaxRetryCount;
     }
 
+    public Boolean getJvmHeapBufferMode() {
+        return jvmHeapBufferMode;
+    }
+
+    public void setJvmHeapBufferMode(Boolean jvmHeapBufferMode) {
+        this.jvmHeapBufferMode = jvmHeapBufferMode;
+    }
+
     protected FluencyBuilderForFluentd configureFluency() {
         FluencyBuilderForFluentd builder = new FluencyBuilderForFluentd();
 
@@ -256,6 +265,9 @@ protected FluencyBuilderForFluentd configureFluency() {
             builder.setSenderMaxRetryCount(senderMaxRetryCount);
         }
         builder.setSslEnabled(sslEnabled);
+        if (jvmHeapBufferMode != null) {
+            builder.setJvmHeapBufferMode(jvmHeapBufferMode);
+        }
 
         return builder;
     }
diff --git a/src/test/resources/logback-appenders-fluentd.xml b/src/test/resources/logback-appenders-fluentd.xml
index 4be7e75..ce0b586 100644
--- a/src/test/resources/logback-appenders-fluentd.xml
+++ b/src/test/resources/logback-appenders-fluentd.xml
@@ -108,6 +108,8 @@
     <!-- [Optional] Enable/Disable use of EventTime to get sub second resolution of log event date-time -->
     <useEventTime>true</useEventTime>
     <sslEnabled>false</sslEnabled>
+    <!-- [Optional] Enable/Disable use the of JVM Heap for buffering -->
+    <jvmHeapBufferMode>false</jvmHeapBufferMode>
     <!-- [Optional] If true, Map Marker is expanded instead of nesting in the marker name -->
     <flattenMapMarker>false</flattenMapMarker>
     <!--  [Optional] default "marker" -->