I have this issue as well. I have actually come across it before and was able to correct it by adding this to my functions.php:
remove_filter( ‘the_content’, ‘wpautop’ );
add_filter( ‘the_content’, ‘wpautop’ , 12);
I’m currently moving all of my data over to ACF and these lines of code don’t correct the issue. Ideas?