diff --git a/js/build/shortcode-ui.js b/js/build/shortcode-ui.js
index adbb7f24..ca72ddd7 100644
--- a/js/build/shortcode-ui.js
+++ b/js/build/shortcode-ui.js
@@ -920,7 +920,7 @@ var mediaFrame = postMediaFrame.extend( {
 	},
 
 	resetMediaController: function( event ) {
-		if ( this.state().props.get('currentShortcode') ) {
+		if ( this.state() && this.state().props.get('currentShortcode') ) {
 			this.mediaController.reset();
 			this.contentRender( 'shortcode-ui', 'insert' );
 		}
diff --git a/js/src/views/media-frame.js b/js/src/views/media-frame.js
index 9a7d396a..c4563685 100644
--- a/js/src/views/media-frame.js
+++ b/js/src/views/media-frame.js
@@ -52,7 +52,7 @@ var mediaFrame = postMediaFrame.extend( {
 	},
 
 	resetMediaController: function( event ) {
-		if ( this.state().props.get('currentShortcode') ) {
+		if ( this.state() && this.state().props.get('currentShortcode') ) {
 			this.mediaController.reset();
 			this.contentRender( 'shortcode-ui', 'insert' );
 		}