diff --git a/wp-content/themes/twentyeleven/functions.php b/wp-content/themes/twentyeleven/functions.php
index 0939f544f2..1ee34738b5 100644
--- a/wp-content/themes/twentyeleven/functions.php
+++ b/wp-content/themes/twentyeleven/functions.php
@@ -286,7 +286,10 @@ function twentyeleven_admin_header_image() { ?>
 		?>
 		<h1><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php echo home_url( '/' ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
 		<div id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
-		<img src="<?php esc_url ( header_image() ); ?>" alt="" />
+		<?php $header_image = get_header_image();
+		if ( ! empty( $header_image ) ) : ?>
+			<img src="<?php esc_url( $header_image ); ?>" alt="" />
+		<?php endif; ?>
 	</div>
 <?php }
 endif; // twentyeleven_admin_header_image
diff --git a/wp-content/themes/twentyeleven/header.php b/wp-content/themes/twentyeleven/header.php
index 921085a3fb..041e5d5c2c 100644
--- a/wp-content/themes/twentyeleven/header.php
+++ b/wp-content/themes/twentyeleven/header.php
@@ -61,7 +61,8 @@
 
 			<?php
 				// Check to see if the header image has been removed
-				if ( get_header_image() != '' ) :
+				$header_image = get_header_image();
+				if ( ! empty( $header_image ) ) :
 			?>
 			<a href="<?php echo home_url( '/' ); ?>">
 				<?php
@@ -83,7 +84,7 @@
 				// Has the text been hidden?
 				if ( 'blank' == get_header_textcolor() ) :
 			?>
-				<div class="only-search<?php if ( get_header_image() != '' ) : ?> with-image<?php endif; ?>">
+				<div class="only-search<?php if ( ! empty( $header_image ) ) : ?> with-image<?php endif; ?>">
 				<?php get_search_form(); ?>
 				</div>
 			<?php