diff --git wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-reviews.php wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-reviews.php
index 9e96d40ac..92930a8ca 100644
--- wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-reviews.php
+++ wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-reviews.php
@@ -20,7 +20,22 @@ class Reviews {
 		$review_count = array_sum( $ratings );
 
 		if ( empty( $reviews ) ) {
-			return '';
+			if( is_user_logged_in() ) {
+				return sprintf(
+					'<div class="notice notice-warning notice-alt"><p>%s</p></div>', 
+					__( 'There are no reviews for this plugin.', 'wporg-plugins' )
+				);
+			}
+
+			return sprintf(
+				/* translators: %s: login URL */
+				__( '<div class="notice notice-warning notice-alt"><p>There are no reviews for this plugin. <a href="%s" rel="nofollow" title="Log in to Wordpress.org">Log in</a> to submit a review.</p></div>', 'wporg-forums' ),
+				add_query_arg(
+					'redirect_to',
+					urlencode( esc_url_raw( sprintf( 'https://wordpress.org/support/plugin/%s/reviews/#new-post', get_post()->post_name ) ) ),
+					'https://login.wordpress.org/'
+				)
+			);
 		}
 
 		ob_start();
diff --git wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/styles/objects/_notices.scss wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/styles/objects/_notices.scss
index d7b40f316..8dab9eed0 100644
--- wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/styles/objects/_notices.scss
+++ wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/styles/objects/_notices.scss
@@ -9,6 +9,11 @@
 		font-size: ms( -2 );
 		margin: 0.5em 0;
 		padding: 2px;
+
+		/* wp4.css is setting a border bottom on anchor tags in paragraphs tags... The notice block requires a paragraph tag */
+		a {
+			border-bottom: 0;
+		}
 	}
 
 	&.notice-alt {