diff --git a/wp-includes/media.php b/wp-includes/media.php
index 6843c61b21..19eba00a6a 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -3098,7 +3098,11 @@ function wp_prepare_attachment_for_js( $attachment ) {
 	);
 
 	$author = new WP_User( $attachment->post_author );
-	$response['authorName'] = $author->display_name;
+	if ( $author->exists() ) {
+		$response['authorName'] = html_entity_decode( $author->display_name, ENT_QUOTES, get_bloginfo( 'charset' ) );
+	} else {
+		$response['authorName'] = __( '(no author)' );
+	}
 
 	if ( $attachment->post_parent ) {
 		$post_parent = get_post( $attachment->post_parent );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1ec35c02a9..47a257893a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.8-beta1-40808';
+$wp_version = '4.8-beta1-40809';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.