diff --git a/app/file-upload/server/lib/requests.js b/app/file-upload/server/lib/requests.js
index d859e3f1a87..b0793af4b9b 100644
--- a/app/file-upload/server/lib/requests.js
+++ b/app/file-upload/server/lib/requests.js
@@ -6,7 +6,7 @@ WebApp.connectHandlers.use('/file-upload/',	function(req, res, next) {
 
 	const match = /^\/([^\/]+)\/(.*)/.exec(req.url);
 
-	if (match[1]) {
+	if (match && match[1]) {
 		const file = Uploads.findOneById(match[1]);
 
 		if (file) {