diff --git a/src/wp-includes/js/customize-preview.js b/src/wp-includes/js/customize-preview.js
index 8d1d759be9..39ac5f4be1 100644
--- a/src/wp-includes/js/customize-preview.js
+++ b/src/wp-includes/js/customize-preview.js
@@ -256,12 +256,14 @@
 			} );
 
 			$( '.custom-logo-link' ).show();
+			$( 'body' ).addClass( 'wp-custom-logo' );
 		} );
 
 		api( 'custom_logo', function( setting ) {
 			setting.bind( function( newValue ) {
 				if ( ! newValue ) {
 					$( '.custom-logo-link' ).hide();
+					$( 'body' ).removeClass( 'wp-custom-logo' );
 				}
 			} );
 
diff --git a/src/wp-includes/post-template.php b/src/wp-includes/post-template.php
index c162ca1c6d..3f5fdc8c27 100644
--- a/src/wp-includes/post-template.php
+++ b/src/wp-includes/post-template.php
@@ -706,6 +706,10 @@ function get_body_class( $class = '' ) {
 	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() )
 		$classes[] = 'custom-background';
 
+	if ( has_custom_logo() ) {
+		$classes[] = 'wp-custom-logo';
+	}
+
 	$page = $wp_query->get( 'page' );
 
 	if ( ! $page || $page < 2 )