Index: src/wp-includes/media-template.php
===================================================================
--- src/wp-includes/media-template.php	(revision 29280)
+++ src/wp-includes/media-template.php	(working copy)
@@ -352,15 +352,18 @@
 					<input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
 				</label>
 				<# if ( 'audio' === data.type ) { #>
-				<?php foreach ( array(
-					'artist' => __( 'Artist' ),
-					'album' => __( 'Album' ),
-				) as $key => $label ) : ?>
-				<label class="setting" data-setting="<?php echo esc_attr( $key ) ?>">
-					<span class="name"><?php echo $label ?></span>
-					<input type="text" value="{{ data.<?php echo $key ?> || data.meta.<?php echo $key ?> || '' }}" />
-				</label>
-				<?php endforeach; ?>
+					<# if ( data.artist || ( data.meta && data.meta.artist ) ) { #>
+					<label class="setting" data-setting="artist">
+						<span class="name"><?php _e( 'Artist' ); ?></span>
+						<input type="text" value="{{ data.artist || data.meta.artist || '' }}" />
+					</label>
+					<# } #>
+					<# if ( data.album || ( data.meta && data.meta.album ) ) { #>
+					<label class="setting" data-setting="album">
+						<span class="name"><?php _e( 'Album' ); ?></span>
+						<input type="text" value="{{ data.album || data.meta.album || '' }}" />
+					</label>
+					<# } #>
 				<# } #>
 				<label class="setting" data-setting="caption">
 					<span class="name"><?php _e( 'Caption' ); ?></span>