diff --git a/src/services/export.service.js b/src/services/export.service.js
index 2072fcb..56bdc82 100644
--- a/src/services/export.service.js
+++ b/src/services/export.service.js
@@ -1,5 +1,5 @@
 const { addPendingBulkExportRequest, findResourceById } = require('../util/mongo.controller');
-const supportedResources = require('../util/supportedResources');
+const supportedResources = require('../util/supportedResources').filter(r => r !== 'ValueSet'); //exclude ValueSet (may be stored but not exported)
 const exportQueue = require('../resources/exportQueue');
 const patientResourceTypes = require('../compartment-definition/patientExportResourceTypes.json');
 const { createOperationOutcome } = require('../util/errorUtils');
diff --git a/src/util/exportToNDJson.js b/src/util/exportToNDJson.js
index f321587..37d9b04 100644
--- a/src/util/exportToNDJson.js
+++ b/src/util/exportToNDJson.js
@@ -62,7 +62,7 @@ const buildSearchParamList = resourceType => {
 const exportToNDJson = async jobOptions => {
   const { clientEntry, types, typeFilter, patient, systemLevelExport, patientIds, elements, byPatient } = jobOptions;
   try {
-    const dirpath = './tmp/';
+    const dirpath = `./tmp/${clientEntry}`;
     fs.mkdirSync(dirpath, { recursive: true });
     let requestTypes = [];
     if (types) {