diff --git a/src/wp-content/themes/twentyseventeen/inc/custom-header.php b/src/wp-content/themes/twentyseventeen/inc/custom-header.php
index a535f5f459..c137ccc41a 100644
--- a/src/wp-content/themes/twentyseventeen/inc/custom-header.php
+++ b/src/wp-content/themes/twentyseventeen/inc/custom-header.php
@@ -35,7 +35,6 @@ function twentyseventeen_custom_header_setup() {
 	 */
 	add_theme_support( 'custom-header', apply_filters( 'twentyseventeen_custom_header_args', array(
 		'default-image'      => get_parent_theme_file_uri( '/assets/images/header.jpg' ),
-		'default-text-color' => 'ffffff',
 		'width'              => 2000,
 		'height'             => 1200,
 		'flex-height'        => true,
@@ -85,10 +84,9 @@ function twentyseventeen_header_style() {
 		else :
 	?>
 		.site-title a,
-		.twentyseventeen-front-page:not(.no-header-image) .site-title,
-		.twentyseventeen-front-page:not(.no-header-image) .site-title a,
+		 body.has-header-image .site-title a,
 		.site-description,
-		.twentyseventeen-front-page:not(.no-header-image) .site-description {
+		body.has-header-image .site-description {
 			color: #<?php echo esc_attr( $header_text_color ); ?>;
 		}
 	<?php endif; ?>
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/header/header-image.php b/src/wp-content/themes/twentyseventeen/template-parts/header/header-image.php
index de03a609c3..17ea8af16b 100644
--- a/src/wp-content/themes/twentyseventeen/template-parts/header/header-image.php
+++ b/src/wp-content/themes/twentyseventeen/template-parts/header/header-image.php
@@ -11,7 +11,6 @@
 ?>
 <div class="custom-header">
 	<?php
-	$header_image = get_header_image();
 
 	// Check if Custom Header image has been added.
 	if ( has_custom_header() ) :