diff --git a/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java b/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
index 220097eda0..834a4b7aa2 100644
--- a/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
+++ b/src/main/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
@@ -3216,10 +3216,17 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
             return null;
         }
 
+        int bufferSize = 40 * 1024;
         File result = null;
         try
         {
-            result = TempFileProvider.createTempFile(contentStream.getStream(), "cmis", "content");
+            InputStream in = null;
+            if (contentStream.getStream() != null)
+            {
+                in = new BufferedInputStream(contentStream.getStream(), bufferSize);
+            }
+
+            result = TempFileProvider.createTempFile(in, "cmis", "content");
         }
         catch (Exception e)
         {