diff --git a/src/Controllers/FilesController.js b/src/Controllers/FilesController.js
index 3cea4ddb..a355396e 100644
--- a/src/Controllers/FilesController.js
+++ b/src/Controllers/FilesController.js
@@ -64,12 +64,16 @@ export class FilesController extends AdaptableController {
         // all filenames starting with "tfss-" should be from files.parsetfss.com
         // all filenames starting with a "-" seperated UUID should be from files.parse.com
         // all other filenames have been migrated or created from Parse Server
-        if (filename.indexOf('tfss-') === 0) {
-          fileObject['url'] = 'http://files.parsetfss.com/' + config.fileKey + '/' + encodeURIComponent(filename);
-        } else if (legacyFilesRegex.test(filename)) {
-          fileObject['url'] = 'http://files.parse.com/' + config.fileKey + '/' + encodeURIComponent(filename);
-        } else {
+        if (config.fileKey === undefined) {
           fileObject['url'] = this.adapter.getFileLocation(config, filename);
+        } else {
+          if (filename.indexOf('tfss-') === 0) {
+            fileObject['url'] = 'http://files.parsetfss.com/' + config.fileKey + '/' + encodeURIComponent(filename);
+          } else if (legacyFilesRegex.test(filename)) {
+            fileObject['url'] = 'http://files.parse.com/' + config.fileKey + '/' + encodeURIComponent(filename);
+          } else {
+            fileObject['url'] = this.adapter.getFileLocation(config, filename);
+          }
         }
       }
     }
diff --git a/src/ParseServer.js b/src/ParseServer.js
index 9a651116..7e96d7c5 100644
--- a/src/ParseServer.js
+++ b/src/ParseServer.js
@@ -109,7 +109,7 @@ class ParseServer {
     dotNetKey,
     restAPIKey,
     webhookKey,
-    fileKey = 'invalid-file-key',
+    fileKey = undefined,
     facebookAppIds = [],
     enableAnonymousUsers = true,
     allowClientClassCreation = true,