diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index 3506bfa04425..e2841c4564ee 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -1415,9 +1415,16 @@ function header_textcolor() {
  * @return string
  */
 function get_header_image() {
-	$default = defined('HEADER_IMAGE') ? HEADER_IMAGE : '';
+	$default = defined( 'HEADER_IMAGE' ) ? HEADER_IMAGE : '';
 
-	return get_theme_mod('header_image', $default);
+	$url = get_theme_mod( 'header_image', $default );
+
+	if ( is_ssl() )
+		$url = str_replace( 'http://', 'https://', $url );
+	else
+		$url = str_replace( 'https://', 'http://', $url );
+
+	return $url;
 }
 
 /**