diff --git a/wp-includes/revision.php b/wp-includes/revision.php
index b588621944..07a986c003 100644
--- a/wp-includes/revision.php
+++ b/wp-includes/revision.php
@@ -594,7 +594,13 @@ function _wp_preview_post_thumbnail_filter( $value, $post_id, $meta_key ) {
 		return $value;
 	}
 
-	if ( empty( $_REQUEST['_thumbnail_id'] ) || $post->ID != $post_id || '_thumbnail_id' != $meta_key || 'revision' == $post->post_type ) {
+	if ( empty( $_REQUEST['_thumbnail_id'] ) ||
+	     empty( $_REQUEST['preview_id'] ) ||
+	     $post->ID != $post_id ||
+	     '_thumbnail_id' != $meta_key ||
+	     'revision' == $post->post_type ||
+	     $post_id != $_REQUEST['preview_id']
+	) {
 		return $value;
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f2bf35405d..c9a24eb878 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6.1-alpha-38475';
+$wp_version = '4.6.1-alpha-38476';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.