diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index 2de6e97a73..b085592754 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -81,7 +81,8 @@ final class _WP_Editors {
 		$settings = apply_filters( 'wp_editor_settings', $settings, $editor_id );
 
 		$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 2112f572ac..310ae4b022 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-43757';
+$wp_version = '5.0-alpha-43758';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.