diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js
index a9768755db..3ef09c89cc 100644
--- a/src/controllers/uploads.js
+++ b/src/controllers/uploads.js
@@ -209,7 +209,8 @@ uploadsController.uploadFile = function (uid, uploadedFile, callback) {
 	}
 
 	var allowed = file.allowedExtensions();
-	var extension = path.extname(uploadedFile.name);
+
+	var extension = path.extname(uploadedFile.name).toLowerCase();
 	if (!extension || extension === '.' || (allowed.length > 0 && allowed.indexOf(extension) === -1)) {
 		return callback(new Error('[[error:invalid-file-type, ' + allowed.join(', ') + ']]'));
 	}
diff --git a/src/file.js b/src/file.js
index 3c510e58d4..35b57d9113 100644
--- a/src/file.js
+++ b/src/file.js
@@ -81,7 +81,7 @@ file.allowedExtensions = function () {
 		if (!extension.startsWith('.')) {
 			extension = '.' + extension;
 		}
-		return extension;
+		return extension.toLowerCase();
 	});
 
 	if (allowedExtensions.indexOf('.jpg') !== -1 && allowedExtensions.indexOf('.jpeg') === -1) {