diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
index 4a9835a478..1b743eddba 100644
--- a/src/wp-includes/general-template.php
+++ b/src/wp-includes/general-template.php
@@ -1376,9 +1376,11 @@ function wp_title( $sep = '»', $display = true, $seplocation = '' ) {
 	// If there's a month.
 	if ( is_archive() && ! empty( $m ) ) {
 		$my_year  = substr( $m, 0, 4 );
-		$my_month = $wp_locale->get_month( substr( $m, 4, 2 ) );
+		$my_month = substr( $m, 4, 2 );
 		$my_day   = (int) substr( $m, 6, 2 );
-		$title    = $my_year . ( $my_month ? $t_sep . $my_month : '' ) . ( $my_day ? $t_sep . $my_day : '' );
+		$title    = $my_year .
+			( $my_month ? $t_sep . $wp_locale->get_month( $my_month ) : '' ) .
+			( $my_day ? $t_sep . $my_day : '' );
 	}
 
 	// If there's a year.
diff --git a/tests/phpunit/tests/general/wpTitle.php b/tests/phpunit/tests/general/wpTitle.php
new file mode 100644
index 0000000000..272441a968
--- /dev/null
+++ b/tests/phpunit/tests/general/wpTitle.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * @group general
+ * @group template
+ * @covers ::wp_title
+ */
+class Tests_General_WpTitle extends WP_UnitTestCase {
+
+	/**
+	 * @ticket 31521
+	 *
+	 * @dataProvider data_wp_title_archive
+	 */
+	public function test_wp_title_archive( $query, $expected ) {
+		self::factory()->post->create(
+			array(
+				'post_status' => 'publish',
+				'post_title'  => 'Test Post',
+				'post_type'   => 'post',
+				'post_date'   => '2021-11-01 18:52:17',
+			)
+		);
+		$this->go_to( '?m=' . $query );
+
+		$this->assertSame( $expected, wp_title( '&raquo;', false ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_wp_title_archive() {
+		return array(
+			'year with posts'                => array(
+				'query'    => '2021',
+				'expected' => ' &raquo; 2021',
+			),
+			'year without posts'             => array(
+				'query'    => '1910',
+				'expected' => ' &raquo; Page not found',
+			),
+			'year and month with posts'      => array(
+				'query'    => '202111',
+				'expected' => ' &raquo; 2021 &raquo; November',
+			),
+			'year and month without posts'   => array(
+				'query'    => '202101',
+				'expected' => ' &raquo; Page not found',
+			),
+			'year, month, day with posts'    => array(
+				'query'    => '20211101',
+				'expected' => ' &raquo; 2021 &raquo; November &raquo; 1',
+			),
+			'year, month, day without posts' => array(
+				'query'    => '20210101',
+				'expected' => ' &raquo; Page not found',
+			),
+		);
+	}
+}