diff --git a/edit-post/hooks/components/media-upload/index.js b/edit-post/hooks/components/media-upload/index.js
index d85a11b2b59ef1..f623a23c37fb06 100644
--- a/edit-post/hooks/components/media-upload/index.js
+++ b/edit-post/hooks/components/media-upload/index.js
@@ -9,6 +9,7 @@ import { castArray, pick } from 'lodash';
 import { parseWithAttributeSchema } from '@wordpress/blocks';
 import { Component } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
+import deprecated from '@wordpress/deprecated';
 
 // Getter for the sake of unit tests.
 const getGalleryDetailsMediaFrame = () => {
@@ -75,7 +76,15 @@ const getAttachmentsCollection = ( ids ) => {
 };
 
 class MediaUpload extends Component {
-	constructor( { multiple = false, type, gallery = false, title = __( 'Select or Upload Media' ), modalClass, value } ) {
+	constructor( {
+		allowedTypes,
+		type: deprecatedType,
+		multiple = false,
+		gallery = false,
+		title = __( 'Select or Upload Media' ),
+		modalClass,
+		value,
+	} ) {
 		super( ...arguments );
 		this.openModal = this.openModal.bind( this );
 		this.onOpen = this.onOpen.bind( this );
@@ -84,6 +93,19 @@ class MediaUpload extends Component {
 		this.onClose = this.onClose.bind( this );
 		this.processMediaCaption = this.processMediaCaption.bind( this );
 
+		let allowedTypesToUse = allowedTypes;
+		if ( ! allowedTypes && deprecatedType ) {
+			deprecated( 'type property of wp.editor.MediaUpload', {
+				version: '4.2',
+				alternative: 'allowedTypes property containing an array with the allowedTypes or do not pass any property if all types are allowed',
+			} );
+			if ( deprecatedType === '*' ) {
+				allowedTypesToUse = undefined;
+			} else {
+				allowedTypesToUse = [ deprecatedType ];
+			}
+		}
+
 		if ( gallery ) {
 			const currentState = value ? 'gallery-edit' : 'gallery';
 			const GalleryDetailsMediaFrame = getGalleryDetailsMediaFrame();
@@ -93,7 +115,7 @@ class MediaUpload extends Component {
 				multiple,
 			} );
 			this.frame = new GalleryDetailsMediaFrame( {
-				mimeType: type,
+				mimeType: allowedTypesToUse,
 				state: currentState,
 				multiple,
 				selection,
@@ -108,8 +130,8 @@ class MediaUpload extends Component {
 				},
 				multiple,
 			};
-			if ( !! type ) {
-				frameConfig.library = { type };
+			if ( !! allowedTypesToUse ) {
+				frameConfig.library = { type: allowedTypesToUse };
 			}
 
 			this.frame = wp.media( frameConfig );
diff --git a/packages/block-library/src/audio/edit.js b/packages/block-library/src/audio/edit.js
index df34522d7d3cb2..9231e2cb1a28b1 100644
--- a/packages/block-library/src/audio/edit.js
+++ b/packages/block-library/src/audio/edit.js
@@ -21,6 +21,8 @@ import {
 } from '@wordpress/editor';
 import { getBlobByURL } from '@wordpress/blob';
 
+const ALLOWED_MEDIA_TYPES = [ 'audio' ];
+
 class AudioEdit extends Component {
 	constructor() {
 		super( ...arguments );
@@ -52,7 +54,7 @@ class AudioEdit extends Component {
 						this.setState( { editing: true } );
 						noticeOperations.createErrorNotice( e );
 					},
-					allowedType: 'audio',
+					allowedTypes: ALLOWED_MEDIA_TYPES,
 				} );
 			}
 		}
@@ -109,7 +111,7 @@ class AudioEdit extends Component {
 					onSelect={ onSelectAudio }
 					onSelectURL={ this.onSelectURL }
 					accept="audio/*"
-					type="audio"
+					allowedTypes={ ALLOWED_MEDIA_TYPES }
 					value={ this.props.attributes }
 					notices={ noticeUI }
 					onError={ noticeOperations.createErrorNotice }
diff --git a/packages/block-library/src/cover-image/index.js b/packages/block-library/src/cover-image/index.js
index 63000909d5806a..29c4d6d491bb32 100644
--- a/packages/block-library/src/cover-image/index.js
+++ b/packages/block-library/src/cover-image/index.js
@@ -54,6 +54,8 @@ const blockAttributes = {
 
 export const name = 'core/cover-image';
 
+const ALLOWED_MEDIA_TYPES = [ 'image' ];
+
 export const settings = {
 	title: __( 'Cover Image' ),
 
@@ -157,7 +159,7 @@ export const settings = {
 					<Toolbar>
 						<MediaUpload
 							onSelect={ onSelectImage }
-							type="image"
+							allowedTypes={ ALLOWED_MEDIA_TYPES }
 							value={ id }
 							render={ ( { open } ) => (
 								<IconButton
@@ -216,7 +218,7 @@ export const settings = {
 						} }
 						onSelect={ onSelectImage }
 						accept="image/*"
-						type="image"
+						allowedTypes={ ALLOWED_MEDIA_TYPES }
 						notices={ noticeUI }
 						onError={ noticeOperations.createErrorNotice }
 					/>
diff --git a/packages/block-library/src/file/edit.js b/packages/block-library/src/file/edit.js
index 9a7eb417345b69..49b57c92205478 100644
--- a/packages/block-library/src/file/edit.js
+++ b/packages/block-library/src/file/edit.js
@@ -56,7 +56,6 @@ class FileEdit extends Component {
 			const file = getBlobByURL( href );
 
 			mediaUpload( {
-				allowedType: '*',
 				filesList: [ file ],
 				onFileChange: ( [ media ] ) => this.onSelectFile( media ),
 				onError: ( message ) => {
@@ -149,7 +148,6 @@ class FileEdit extends Component {
 					notices={ noticeUI }
 					onError={ noticeOperations.createErrorNotice }
 					accept="*"
-					type="*"
 				/>
 			);
 		}
@@ -174,7 +172,6 @@ class FileEdit extends Component {
 					<Toolbar>
 						<MediaUpload
 							onSelect={ this.onSelectFile }
-							type="*"
 							value={ id }
 							render={ ( { open } ) => (
 								<IconButton
diff --git a/packages/block-library/src/gallery/edit.js b/packages/block-library/src/gallery/edit.js
index 5190799474f112..ae9e54d8be27db 100644
--- a/packages/block-library/src/gallery/edit.js
+++ b/packages/block-library/src/gallery/edit.js
@@ -38,6 +38,7 @@ const linkOptions = [
 	{ value: 'media', label: __( 'Media File' ) },
 	{ value: 'none', label: __( 'None' ) },
 ];
+const ALLOWED_MEDIA_TYPES = [ 'image' ];
 
 export function defaultColumnsNumber( attributes ) {
 	return Math.min( 3, attributes.images.length );
@@ -131,7 +132,7 @@ class GalleryEdit extends Component {
 		const currentImages = this.props.attributes.images || [];
 		const { noticeOperations, setAttributes } = this.props;
 		mediaUpload( {
-			allowedType: 'image',
+			allowedTypes: ALLOWED_MEDIA_TYPES,
 			filesList: files,
 			onFileChange: ( images ) => {
 				setAttributes( {
@@ -168,7 +169,7 @@ class GalleryEdit extends Component {
 					<Toolbar>
 						<MediaUpload
 							onSelect={ this.onSelectImages }
-							type="image"
+							allowedTypes={ ALLOWED_MEDIA_TYPES }
 							multiple
 							gallery
 							value={ images.map( ( img ) => img.id ) }
@@ -199,7 +200,7 @@ class GalleryEdit extends Component {
 						} }
 						onSelect={ this.onSelectImages }
 						accept="image/*"
-						type="image"
+						allowedTypes={ ALLOWED_MEDIA_TYPES }
 						multiple
 						notices={ noticeUI }
 						onError={ noticeOperations.createErrorNotice }
diff --git a/packages/block-library/src/gallery/index.js b/packages/block-library/src/gallery/index.js
index 835e85e2b32f42..332a6ac5fd3268 100644
--- a/packages/block-library/src/gallery/index.js
+++ b/packages/block-library/src/gallery/index.js
@@ -136,7 +136,7 @@ export const settings = {
 					mediaUpload( {
 						filesList: files,
 						onFileChange: ( images ) => onChange( block.clientId, { images } ),
-						allowedType: 'image',
+						allowedTypes: [ 'image' ],
 					} );
 					return block;
 				},
diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js
index 77bd51c8c81740..d54638785f3e74 100644
--- a/packages/block-library/src/image/edit.js
+++ b/packages/block-library/src/image/edit.js
@@ -54,6 +54,7 @@ const LINK_DESTINATION_NONE = 'none';
 const LINK_DESTINATION_MEDIA = 'media';
 const LINK_DESTINATION_ATTACHMENT = 'attachment';
 const LINK_DESTINATION_CUSTOM = 'custom';
+const ALLOWED_MEDIA_TYPES = [ 'image' ];
 
 class ImageEdit extends Component {
 	constructor() {
@@ -88,7 +89,7 @@ class ImageEdit extends Component {
 					onFileChange: ( [ image ] ) => {
 						setAttributes( { ...image } );
 					},
-					allowedType: 'image',
+					allowedTypes: ALLOWED_MEDIA_TYPES,
 				} );
 			}
 		}
@@ -221,7 +222,7 @@ class ImageEdit extends Component {
 				<Toolbar>
 					<MediaUpload
 						onSelect={ this.onSelectImage }
-						type="image"
+						allowedTypes={ ALLOWED_MEDIA_TYPES }
 						value={ id }
 						render={ ( { open } ) => (
 							<IconButton
@@ -251,7 +252,7 @@ class ImageEdit extends Component {
 						notices={ noticeUI }
 						onError={ noticeOperations.createErrorNotice }
 						accept="image/*"
-						type="image"
+						allowedTypes={ ALLOWED_MEDIA_TYPES }
 					/>
 				</Fragment>
 			);
diff --git a/packages/block-library/src/video/edit.js b/packages/block-library/src/video/edit.js
index 295f3c0abcd18e..7158496b1a4e28 100644
--- a/packages/block-library/src/video/edit.js
+++ b/packages/block-library/src/video/edit.js
@@ -24,6 +24,8 @@ import {
 } from '@wordpress/editor';
 import { getBlobByURL } from '@wordpress/blob';
 
+const ALLOWED_MEDIA_TYPES = [ 'video' ];
+
 class VideoEdit extends Component {
 	constructor() {
 		super( ...arguments );
@@ -55,7 +57,7 @@ class VideoEdit extends Component {
 						this.setState( { editing: true } );
 						noticeOperations.createErrorNotice( message );
 					},
-					allowedType: 'video',
+					allowedTypes: ALLOWED_MEDIA_TYPES,
 				} );
 			}
 		}
@@ -138,7 +140,7 @@ class VideoEdit extends Component {
 					onSelect={ onSelectVideo }
 					onSelectURL={ this.onSelectURL }
 					accept="video/*"
-					type="video"
+					allowedTypes={ ALLOWED_MEDIA_TYPES }
 					value={ this.props.attributes }
 					notices={ noticeUI }
 					onError={ noticeOperations.createErrorNotice }
@@ -198,7 +200,7 @@ class VideoEdit extends Component {
 							<MediaUpload
 								title={ __( 'Select Poster Image' ) }
 								onSelect={ this.onSelectPoster }
-								type="image"
+								allowedTypes={ ALLOWED_MEDIA_TYPES }
 								render={ ( { open } ) => (
 									<Button isDefault onClick={ open }>
 										{ ! this.props.attributes.poster ? __( 'Select Poster Image' ) : __( 'Replace image' ) }
diff --git a/packages/editor/src/components/media-placeholder/index.js b/packages/editor/src/components/media-placeholder/index.js
index b0912c46c91844..bb2dc71b3d7978 100644
--- a/packages/editor/src/components/media-placeholder/index.js
+++ b/packages/editor/src/components/media-placeholder/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { get, noop } from 'lodash';
+import { every, get, noop, startsWith } from 'lodash';
 import classnames from 'classnames';
 
 /**
@@ -15,6 +15,7 @@ import {
 } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
 import { Component } from '@wordpress/element';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -34,6 +35,33 @@ class MediaPlaceholder extends Component {
 		this.onFilesUpload = this.onFilesUpload.bind( this );
 	}
 
+	getAllowedTypes() {
+		const { allowedTypes, type: deprecatedType } = this.props;
+		let allowedTypesToUse = allowedTypes;
+		if ( ! allowedTypes && deprecatedType ) {
+			deprecated( 'type property of wp.editor.MediaPlaceholder', {
+				version: '4.2',
+				alternative: 'allowedTypes property containing an array with the allowedTypes or do not pass any property if all types are allowed',
+			} );
+			if ( deprecatedType === '*' ) {
+				allowedTypesToUse = undefined;
+			} else {
+				allowedTypesToUse = [ deprecatedType ];
+			}
+		}
+		return allowedTypesToUse;
+	}
+
+	onlyAllowsImages() {
+		const allowedTypes = this.getAllowedTypes();
+		if ( ! allowedTypes ) {
+			return false;
+		}
+		return every( allowedTypes, ( allowedType ) => {
+			return allowedType === 'image' || startsWith( allowedType, 'image/' );
+		} );
+	}
+
 	componentDidMount() {
 		this.setState( { src: get( this.props.value, [ 'src' ], '' ) } );
 	}
@@ -62,10 +90,11 @@ class MediaPlaceholder extends Component {
 	}
 
 	onFilesUpload( files ) {
-		const { onSelect, type, multiple, onError } = this.props;
+		const { onSelect, multiple, onError } = this.props;
+		const allowedTypes = this.getAllowedTypes();
 		const setMedia = multiple ? onSelect : ( [ media ] ) => onSelect( media );
 		mediaUpload( {
-			allowedType: type,
+			allowedTypes,
 			filesList: files,
 			onFileChange: setMedia,
 			onError,
@@ -74,7 +103,6 @@ class MediaPlaceholder extends Component {
 
 	render() {
 		const {
-			type,
 			accept,
 			icon,
 			className,
@@ -86,7 +114,7 @@ class MediaPlaceholder extends Component {
 			multiple = false,
 			notices,
 		} = this.props;
-
+		const allowedTypes = this.getAllowedTypes();
 		return (
 			<Placeholder
 				icon={ icon }
@@ -127,10 +155,10 @@ class MediaPlaceholder extends Component {
 					{ __( 'Upload' ) }
 				</FormFileUpload>
 				<MediaUpload
-					gallery={ multiple && type === 'image' }
+					gallery={ multiple && this.onlyAllowsImages() }
 					multiple={ multiple }
 					onSelect={ onSelect }
-					type={ type }
+					allowedTypes={ allowedTypes }
 					value={ value.id }
 					render={ ( { open } ) => (
 						<Button isLarge onClick={ open }>
diff --git a/packages/editor/src/components/media-upload/README.md b/packages/editor/src/components/media-upload/README.md
index d54dccb4d699d0..b248ee36692051 100644
--- a/packages/editor/src/components/media-upload/README.md
+++ b/packages/editor/src/components/media-upload/README.md
@@ -29,11 +29,13 @@ You can check how this component is implemented for the edit post page using `wp
 import { Button } from '@wordpress/components';
 import { MediaUpload } from '@wordpress/editor';
 
+const ALLOWED_MEDIA_TYPES = [ 'audio' ];
+
 function MyMediaUploader() {
 	return (
 		<MediaUpload
 			onSelect={ ( media ) => console.log( 'selected ' + media.length ) }
-			type="image"
+			allowedTypes={ ALLOWED_MEDIA_TYPES }
 			value={ mediaId }
 			render={ ( { open } ) => (
 				<Button onClick={ open }>
@@ -49,11 +51,14 @@ function MyMediaUploader() {
 
 The component accepts the following props. Props not included in this set will be applied to the element wrapping Popover content.
 
-### type
+### allowedTypes
 
-Type of the media to upload/select from the media library (image, video, audio).
+Array with the types of the media to upload/select from the media library.
+Each type is a string that can contain the general mime type e.g: 'image', 'audio', 'text',
+or the complete mime type e.g: 'audio/mpeg', 'image/gif'.
+If allowedTypes is unset all mime types should be allowed.
 
-- Type: `String`
+- Type: `Array`
 - Required: No
 
 ### multiple
diff --git a/packages/editor/src/components/post-featured-image/index.js b/packages/editor/src/components/post-featured-image/index.js
index 849e49ec2d7139..16b22eade59368 100644
--- a/packages/editor/src/components/post-featured-image/index.js
+++ b/packages/editor/src/components/post-featured-image/index.js
@@ -18,6 +18,8 @@ import { withSelect, withDispatch } from '@wordpress/data';
 import PostFeaturedImageCheck from './check';
 import MediaUpload from '../media-upload';
 
+const ALLOWED_MEDIA_TYPES = [ 'image' ];
+
 // Used when labels from post type were not yet loaded or when they are not present.
 const DEFAULT_SET_FEATURE_IMAGE_LABEL = __( 'Set featured image' );
 const DEFAULT_REMOVE_FEATURE_IMAGE_LABEL = __( 'Remove image' );
@@ -46,7 +48,7 @@ function PostFeaturedImage( { currentPostId, featuredImageId, onUpdateImage, onR
 					<MediaUpload
 						title={ __( 'Set featured image' ) }
 						onSelect={ onUpdateImage }
-						type="image"
+						allowedTypes={ ALLOWED_MEDIA_TYPES }
 						modalClass="editor-post-featured-image__media-modal"
 						render={ ( { open } ) => (
 							<Button className="editor-post-featured-image__preview" onClick={ open }>
@@ -67,7 +69,7 @@ function PostFeaturedImage( { currentPostId, featuredImageId, onUpdateImage, onR
 				<MediaUpload
 					title={ postLabel.set_featured_image || DEFAULT_SET_FEATURE_IMAGE_LABEL }
 					onSelect={ onUpdateImage }
-					type="image"
+					allowedTypes={ ALLOWED_MEDIA_TYPES }
 					modalClass="editor-post-featured-image__media-modal"
 					render={ ( { open } ) => (
 						<Button onClick={ open } isDefault isLarge>
@@ -81,7 +83,7 @@ function PostFeaturedImage( { currentPostId, featuredImageId, onUpdateImage, onR
 						<MediaUpload
 							title={ postLabel.set_featured_image || DEFAULT_SET_FEATURE_IMAGE_LABEL }
 							onSelect={ onUpdateImage }
-							type="image"
+							allowedTypes={ ALLOWED_MEDIA_TYPES }
 							modalClass="editor-post-featured-image__media-modal"
 							render={ ( { open } ) => (
 								<Button className="editor-post-featured-image__toggle" onClick={ open }>
diff --git a/packages/editor/src/components/rich-text/core-tokens/image/index.js b/packages/editor/src/components/rich-text/core-tokens/image/index.js
index 9940626dd0e648..1b328b6c4eff74 100644
--- a/packages/editor/src/components/rich-text/core-tokens/image/index.js
+++ b/packages/editor/src/components/rich-text/core-tokens/image/index.js
@@ -10,6 +10,8 @@ import MediaUpload from '../../../media-upload';
 
 export const name = 'core/image';
 
+const ALLOWED_MEDIA_TYPES = [ 'image' ];
+
 export const settings = {
 	id: 'image',
 
@@ -22,7 +24,7 @@ export const settings = {
 	edit( { onSave } ) {
 		return (
 			<MediaUpload
-				type="image"
+				allowedTypes={ ALLOWED_MEDIA_TYPES }
 				onSelect={ ( media ) => onSave( media ) }
 				onClose={ () => onSave( null ) }
 				render={ ( { open } ) => {
diff --git a/packages/editor/src/utils/media-upload/index.js b/packages/editor/src/utils/media-upload/index.js
index 5a8e39d7159e06..1b5d104faa38b5 100644
--- a/packages/editor/src/utils/media-upload/index.js
+++ b/packages/editor/src/utils/media-upload/index.js
@@ -7,6 +7,7 @@ import { noop } from 'lodash';
  * WordPress dependencies
  */
 import { select } from '@wordpress/data';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -18,28 +19,41 @@ import { mediaUpload } from './media-upload';
  * Wrapper around mediaUpload() that injects the current post ID.
  *
  * @param   {Object}   $0                   Parameters object passed to the function.
- * @param   {string}   $0.allowedType       The type of media that can be uploaded, or '*' to allow all.
+ * @param   {string}   $0.allowedTypes      Array with the types of media that can be uploaded, if unset all types are allowed.
  * @param   {Array}    $0.filesList         List of files.
  * @param   {?number}  $0.maxUploadFileSize Maximum upload size in bytes allowed for the site.
  * @param   {Function} $0.onError           Function called when an error happens.
  * @param   {Function} $0.onFileChange      Function called each time a file or a temporary representation of the file is available.
  */
 export default function( {
-	allowedType,
+	allowedTypes,
 	filesList,
 	maxUploadFileSize,
 	onError = noop,
 	onFileChange,
+	allowedType,
 } ) {
 	const {
 		getCurrentPostId,
 		getEditorSettings,
 	} = select( 'core/editor' );
-	const allowedMimeTypes = getEditorSettings().allowedMimeTypes;
+	const wpAllowedMimeTypes = getEditorSettings().allowedMimeTypes;
 	maxUploadFileSize = maxUploadFileSize || getEditorSettings().maxUploadFileSize;
 
+	let allowedTypesToUse = allowedTypes;
+	if ( ! allowedTypes && allowedType ) {
+		deprecated( 'allowedType parameter property of wp.editor.mediaUpload', {
+			version: '4.2',
+			alternative: 'allowedTypes property containing an array with the allowedTypes or do not pass any property if all types are allowed',
+		} );
+		if ( allowedType === '*' ) {
+			allowedTypesToUse = undefined;
+		} else {
+			allowedTypesToUse = [ allowedType ];
+		}
+	}
 	mediaUpload( {
-		allowedType,
+		allowedTypes: allowedTypesToUse,
 		filesList,
 		onFileChange,
 		additionalData: {
@@ -47,6 +61,6 @@ export default function( {
 		},
 		maxUploadFileSize,
 		onError: ( { message } ) => onError( message ),
-		allowedMimeTypes,
+		wpAllowedMimeTypes,
 	} );
 }
diff --git a/packages/editor/src/utils/media-upload/media-upload.js b/packages/editor/src/utils/media-upload/media-upload.js
index 0685b057fafb26..6fad25c59b5daa 100644
--- a/packages/editor/src/utils/media-upload/media-upload.js
+++ b/packages/editor/src/utils/media-upload/media-upload.js
@@ -1,7 +1,18 @@
 /**
  * External Dependencies
  */
-import { compact, flatMap, forEach, get, has, includes, map, noop, startsWith } from 'lodash';
+import {
+	compact,
+	flatMap,
+	forEach,
+	get,
+	has,
+	includes,
+	map,
+	noop,
+	some,
+	startsWith,
+} from 'lodash';
 
 /**
  * WordPress dependencies
@@ -40,23 +51,23 @@ export function getMimeTypesArray( wpMimeTypesObject ) {
  *
  *	TODO: future enhancement to add an upload indicator.
  *
- * @param   {Object}   $0                   Parameters object passed to the function.
- * @param   {string}   $0.allowedType       The type of media that can be uploaded, or '*' to allow all.
- * @param   {?Object}  $0.additionalData    Additional data to include in the request.
- * @param   {Array}    $0.filesList         List of files.
- * @param   {?number}  $0.maxUploadFileSize Maximum upload size in bytes allowed for the site.
- * @param   {Function} $0.onError           Function called when an error happens.
- * @param   {Function} $0.onFileChange      Function called each time a file or a temporary representation of the file is available.
- * @param   {?Object} $0.allowedMimeTypes   List of allowed mime types and file extensions.
+ * @param   {Object}   $0                    Parameters object passed to the function.
+ * @param   {?Array}   $0.allowedTypes       Array with the types of media that can be uploaded, if unset all types are allowed.
+ * @param   {?Object}  $0.additionalData     Additional data to include in the request.
+ * @param   {Array}    $0.filesList          List of files.
+ * @param   {?number}  $0.maxUploadFileSize  Maximum upload size in bytes allowed for the site.
+ * @param   {Function} $0.onError            Function called when an error happens.
+ * @param   {Function} $0.onFileChange       Function called each time a file or a temporary representation of the file is available.
+ * @param   {?Object}  $0.wpAllowedMimeTypes List of allowed mime types and file extensions.
  */
 export function mediaUpload( {
-	allowedType,
+	allowedTypes,
 	additionalData = {},
 	filesList,
 	maxUploadFileSize,
 	onError = noop,
 	onFileChange,
-	allowedMimeTypes = null,
+	wpAllowedMimeTypes = null,
 } ) {
 	// Cast filesList to array
 	const files = [ ...filesList ];
@@ -70,11 +81,24 @@ export function mediaUpload( {
 
 	// Allowed type specified by consumer
 	const isAllowedType = ( fileType ) => {
-		return ( allowedType === '*' ) || startsWith( fileType, `${ allowedType }/` );
+		if ( ! allowedTypes ) {
+			return true;
+		}
+		return some(
+			allowedTypes,
+			( allowedType ) => {
+				// If a complete mimetype is specified verify if it matches exactly the mime type of the file.
+				if ( includes( allowedType, '/' ) ) {
+					return allowedType === fileType;
+				}
+				// Otherwise a general mime type is used and we should verify if the file mimetype starts with it.
+				return startsWith( fileType, `${ allowedType }/` );
+			}
+		);
 	};
 
 	// Allowed types for the current WP_User
-	const allowedMimeTypesForUser = getMimeTypesArray( allowedMimeTypes );
+	const allowedMimeTypesForUser = getMimeTypesArray( wpAllowedMimeTypes );
 	const isAllowedMimeTypeForUser = ( fileType ) => {
 		return includes( allowedMimeTypesForUser, fileType );
 	};
diff --git a/packages/editor/src/utils/media-upload/test/media-upload.js b/packages/editor/src/utils/media-upload/test/media-upload.js
index 0b6bc991bd19dd..04a356677ff79b 100644
--- a/packages/editor/src/utils/media-upload/test/media-upload.js
+++ b/packages/editor/src/utils/media-upload/test/media-upload.js
@@ -18,6 +18,13 @@ const validMediaObj = {
 
 describe( 'mediaUpload', () => {
 	const onFileChangeSpy = jest.fn();
+	const createObjectURL = jest.fn();
+	window.URL.createObjectURL = createObjectURL;
+
+	beforeEach( () => {
+		onFileChangeSpy.mockReset();
+		createObjectURL.mockReset();
+	} );
 
 	it( 'should do nothing on no files', () => {
 		mediaUpload( { filesList: [], onFileChange: onFileChangeSpy, allowedType: 'image' } );
@@ -29,7 +36,7 @@ describe( 'mediaUpload', () => {
 		mediaUpload( {
 			filesList: [ invalidMediaObj ],
 			onFileChange: onFileChangeSpy,
-			allowedType: 'image',
+			allowedTypes: [ 'image' ],
 			onError,
 		} );
 		expect( onFileChangeSpy ).not.toHaveBeenCalled();
@@ -37,11 +44,103 @@ describe( 'mediaUpload', () => {
 		expect( onError.mock.calls[ 0 ][ 0 ].code ).toBe( 'MIME_TYPE_NOT_SUPPORTED' );
 	} );
 
+	it( 'should error if allowedTypes contains a complete mime type string and the validation fails', () => {
+		const onError = jest.fn();
+		const testFile = {
+			url: 'https://cldup.com/uuUqE_dXzy.mp3',
+			type: 'image/jpeg',
+			name: 'myImage.jpeg',
+		};
+		expect( () => {
+			mediaUpload( {
+				filesList: [ testFile ],
+				onFileChange: onFileChangeSpy,
+				allowedTypes: [ 'image/gif' ],
+				onError,
+			} );
+		} ).not.toThrow();
+		expect( createObjectURL ).not.toHaveBeenCalled();
+		expect( onError ).toHaveBeenCalled();
+		expect( onError.mock.calls[ 0 ][ 0 ].code ).toBe( 'MIME_TYPE_NOT_SUPPORTED' );
+
+		createObjectURL.mockReset();
+	} );
+
+	it( 'should work as expected if allowedTypes contains a complete mime type string and the validation has success', () => {
+		// When the upload has success we get errors because we don't have available on the test environment
+		// all the functions required by mediaUpload.
+		// We know that when a validation success the function tries to create a temporary url for the file
+		// so we use that function to test the validation success.
+		const onError = jest.fn();
+		const testFile = {
+			url: 'https://cldup.com/uuUqE_dXzy.mp3',
+			type: 'image/jpeg',
+			name: 'myImage.jpeg',
+		};
+
+		expect( () => {
+			mediaUpload( {
+				filesList: [ testFile ],
+				onFileChange: onFileChangeSpy,
+				allowedTypes: [ 'image/jpeg' ],
+				onError,
+			} );
+		} ).toThrow();
+		expect( createObjectURL ).not.toHaveBeenCalled();
+		expect( onError ).not.toHaveBeenCalled();
+	} );
+
+	it( 'should error if allowedTypes contains multiple types and the validation fails', () => {
+		const onError = jest.fn();
+		const testFile = {
+			url: 'https://cldup.com/uuUqE_dXzy.mp3',
+			type: 'audio/mp3',
+			name: 'mymusic.mp3',
+		};
+		expect( () => {
+			mediaUpload( {
+				filesList: [ testFile ],
+				onFileChange: onFileChangeSpy,
+				allowedTypes: [ 'video', 'image' ],
+				onError,
+			} );
+		} ).not.toThrow();
+		expect( createObjectURL ).not.toHaveBeenCalled();
+		expect( onError ).toHaveBeenCalled();
+		expect( onError.mock.calls[ 0 ][ 0 ].code ).toBe( 'MIME_TYPE_NOT_SUPPORTED' );
+
+		createObjectURL.mockReset();
+	} );
+
+	it( 'should work as expected if allowedTypes contains multiple types and the validation has success', () => {
+		// When the upload has success we get errors because we don't have available on the test environment
+		// all the functions required by mediaUpload.
+		// We know that when a validation success the function tries to create a temporary url for the file
+		// so we use that function to test the validation success.
+		const onError = jest.fn();
+		const testFile = {
+			url: 'https://cldup.com/uuUqE_dXzy.mp3',
+			type: 'audio/mp3',
+			name: 'mymusic.mp3',
+		};
+
+		expect( () => {
+			mediaUpload( {
+				filesList: [ testFile ],
+				onFileChange: onFileChangeSpy,
+				allowedTypes: [ 'image', 'audio' ],
+				onError,
+			} );
+		} ).toThrow();
+		expect( createObjectURL ).not.toHaveBeenCalled();
+		expect( onError ).not.toHaveBeenCalled();
+	} );
+
 	it( 'should call error handler with the correct error object if file size is greater than the maximum', () => {
 		const onError = jest.fn();
 
 		mediaUpload( {
-			allowedType: 'image',
+			allowedTypes: [ 'image' ],
 			filesList: [ validMediaObj ],
 			onFileChange: onFileChangeSpy,
 			maxUploadFileSize: 512,
@@ -53,14 +152,14 @@ describe( 'mediaUpload', () => {
 
 	it( 'should call error handler with the correct error object if file type is not allowed for user', () => {
 		const onError = jest.fn();
-		const allowedMimeTypes = { aac: 'audio/aac' };
+		const wpAllowedMimeTypes = { aac: 'audio/aac' };
 
 		mediaUpload( {
-			allowedType: 'image',
+			allowedTypes: [ 'image' ],
 			filesList: [ validMediaObj ],
 			onFileChange: onFileChangeSpy,
 			onError,
-			allowedMimeTypes,
+			wpAllowedMimeTypes,
 		} );
 		expect( onError ).toHaveBeenCalled();
 		expect( onError.mock.calls[ 0 ][ 0 ].code ).toBe( 'MIME_TYPE_NOT_ALLOWED_FOR_USER' );