diff --git a/app/file-upload/lib/FileUploadBase.js b/app/file-upload/lib/FileUploadBase.js
index cbd8cb699d8..c162688d3f6 100644
--- a/app/file-upload/lib/FileUploadBase.js
+++ b/app/file-upload/lib/FileUploadBase.js
@@ -1,3 +1,5 @@
+import path from 'path';
+
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import { UploadFS } from 'meteor/jalik:ufs';
@@ -6,6 +8,11 @@ import _ from 'underscore';
 import { canAccessRoom, hasPermission } from '../../authorization';
 import { settings } from '../../settings';
 
+// set ufs temp dir to $TMPDIR/ufs instead of /tmp/ufs if the variable is set
+if ('TMPDIR' in process.env) {
+	UploadFS.config.tmpDir = path.join(process.env.TMPDIR, 'ufs');
+}
+
 UploadFS.config.defaultStorePermissions = new UploadFS.StorePermissions({
 	insert(userId, doc) {
 		if (userId) {