diff --git a/src/wp-includes/js/mce-view.js b/src/wp-includes/js/mce-view.js
index 3758e9c7a7..3ce42e9000 100644
--- a/src/wp-includes/js/mce-view.js
+++ b/src/wp-includes/js/mce-view.js
@@ -561,6 +561,8 @@ window.wp = window.wp || {};
 			setNodes: function () {
 				if ( this.parsed ) {
 					this.setIframes( this.parsed );
+				} else if ( this.parsed === false ) {
+					this.setContent( '<p>' + this.original + '</p>', 'replace' );
 				}
 			},
 
@@ -574,6 +576,9 @@ window.wp = window.wp || {};
 						shortcode: this.shortcode.string()
 					}
 				} )
+				.always( function() {
+					self.parsed = false;
+				} )
 				.done( function( response ) {
 					if ( response ) {
 						self.parsed = response;