diff --git a/wp-includes/class-wp-customize-setting.php b/wp-includes/class-wp-customize-setting.php
index 09c8f934be..b52ec981ae 100644
--- a/wp-includes/class-wp-customize-setting.php
+++ b/wp-includes/class-wp-customize-setting.php
@@ -398,13 +398,15 @@ class WP_Customize_Setting {
 				<?php
 				break;
 			case 'upload':
+				$value = $this->value();
+				$style = empty( $value ) ? 'style="display:none;"' : '';
 				?>
 				<label>
 					<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
 					<div>
 						<input type="hidden" value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->name(); ?> />
 						<a href="#" class="button-secondary upload"><?php _e( 'Upload' ); ?></a>
-						<a href="#" class="remove"><?php _e( 'Remove' ); ?></a>
+						<a href="#" class="remove" <?php echo $style; ?>><?php _e( 'Remove' ); ?></a>
 					</div>
 				</label>
 				<?php
diff --git a/wp-includes/js/customize-controls.dev.js b/wp-includes/js/customize-controls.dev.js
index 6688d1f48b..e645794968 100644
--- a/wp-includes/js/customize-controls.dev.js
+++ b/wp-includes/js/customize-controls.dev.js
@@ -83,10 +83,16 @@
 				}
 			});
 
-			this.container.on( 'click', '.remove', function( event ) {
+			this.remover = this.container.find('.remove');
+			this.remover.click( function( event ) {
 				control.set('');
 				event.preventDefault();
 			});
+
+			this.bind( this.removerVisibility );
+		},
+		removerVisibility: function( on ) {
+			this.remover.toggle( !! on );
 		}
 	});