diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetRecordWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetRecordWriter.java
index bcea784..5858b08 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetRecordWriter.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetRecordWriter.java
@@ -477,6 +477,7 @@
     } finally {
       store.close();
       pageStore.close();
+      codecFactory.release();
 
       store = null;
       pageStore = null;
@@ -741,8 +742,6 @@
   @Override
   public void cleanup() throws IOException {
     flush(true);
-
-    codecFactory.release();
   }
 
   private void createParquetFileWriter() throws IOException {