diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/HiveDefaultRecordReader.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/HiveDefaultRecordReader.java
index d490f5d..8598643 100644
--- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/HiveDefaultRecordReader.java
+++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/HiveDefaultRecordReader.java
@@ -271,10 +271,13 @@
         this.partitionToTableSchemaConverter = (obj) -> obj;
         this.finalObjInspector = tableObjInspector;
 
+        HiveUtilities.addConfToJob(job, hiveTableProperties);
         job.setInputFormat(HiveUtilities.getInputFormatClass(job, hiveTable.getSd(), hiveTable));
         HiveUtilities.verifyAndAddTransactionalProperties(job, hiveTable.getSd());
       } else {
-        this.partitionDeserializer = createDeserializer(job, partition.getSd(), HiveUtilities.getPartitionMetadata(partition, hiveTable));
+        Properties partitionProperties = HiveUtilities.getPartitionMetadata(partition, hiveTable);
+        HiveUtilities.addConfToJob(job, partitionProperties);
+        this.partitionDeserializer = createDeserializer(job, partition.getSd(), partitionProperties);
         this.partitionObjInspector = getStructOI(partitionDeserializer);
 
         this.finalObjInspector = (StructObjectInspector) ObjectInspectorConverters.getConvertedOI(partitionObjInspector, tableObjInspector);
