diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index c96eb7c09f..a9e5e04f2e 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -82,7 +82,8 @@ final class _WP_Editors {
 		$set = wp_parse_args(
 			$settings,
 			array(
-				'wpautop'             => true,
+				// Disable autop if the current post has blocks in it.
+				'wpautop'             => ! has_blocks(),
 				'media_buttons'       => true,
 				'default_editor'      => '',
 				'drag_drop_upload'    => false,
diff --git a/wp-includes/version.php b/wp-includes/version.php
index bcfe191e8a..2d750b239e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.1-alpha-44119';
+$wp_version = '5.1-alpha-44120';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.