diff --git a/packages/rocketchat-lib/lib/fileUploadRestrictions.js b/packages/rocketchat-lib/lib/fileUploadRestrictions.js
index 2b4633cd2ff..69ff860c025 100644
--- a/packages/rocketchat-lib/lib/fileUploadRestrictions.js
+++ b/packages/rocketchat-lib/lib/fileUploadRestrictions.js
@@ -1,7 +1,7 @@
 RocketChat.fileUploadMediaWhiteList = function() {
 	var mediaTypeWhiteList = RocketChat.settings.get('FileUpload_MediaTypeWhiteList');
 
-	if (!mediaTypeWhiteList) {
+	if (!mediaTypeWhiteList || mediaTypeWhiteList === '*') {
 		return;
 	}
 	return _.map(mediaTypeWhiteList.split(','), function(item) {