diff --git a/package.json b/package.json
index c0c046046e..a4ade30e13 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "mime": "1.3.4",
     "mongodb": "2.2.9",
     "multer": "1.2.0",
+    "node-uuid": "^1.4.7",
     "parse": "1.9.1",
     "parse-server-fs-adapter": "1.0.1",
     "parse-server-push-adapter": "1.1.0",
diff --git a/src/Controllers/FilesController.js b/src/Controllers/FilesController.js
index 6bbeb4377d..c2ed30c7b0 100644
--- a/src/Controllers/FilesController.js
+++ b/src/Controllers/FilesController.js
@@ -5,6 +5,7 @@ import AdaptableController from './AdaptableController';
 import { FilesAdapter } from '../Adapters/Files/FilesAdapter';
 import path  from 'path';
 import mime from 'mime';
+import uuid from 'node-uuid';
 
 const legacyFilesRegex = new RegExp("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}-.*");
 
@@ -26,7 +27,7 @@ export class FilesController extends AdaptableController {
       contentType = mime.lookup(filename);
     }
 
-    filename = randomHexString(32) + '_' + filename;
+    filename = uuid.v4() + '_' + filename;
 
     var location = this.adapter.getFileLocation(config, filename);
     return this.adapter.createFile(filename, data, contentType).then(() => {