diff --git a/src/wp-includes/class-wpdb.php b/src/wp-includes/class-wpdb.php
index 23c865b87d817..8168e0b5c515c 100644
--- a/src/wp-includes/class-wpdb.php
+++ b/src/wp-includes/class-wpdb.php
@@ -1453,11 +1453,11 @@ private function _escape_identifier_value( $identifier ) {
 	 *                             individual arguments.
 	 * @param mixed       ...$args Further variables to substitute into the query's placeholders
 	 *                             if being called with individual arguments.
-	 * @return string|void Sanitized query string, if there is a query to prepare.
+	 * @return string|null Sanitized query string, if there is a query to prepare.
 	 */
 	public function prepare( $query, ...$args ) {
 		if ( is_null( $query ) ) {
-			return;
+			return null;
 		}
 
 		/*
@@ -2117,7 +2117,9 @@ public function parse_db_host( $host ) {
 	 * @since 3.9.0
 	 *
 	 * @param bool $allow_bail Optional. Allows the function to bail. Default true.
-	 * @return bool|void True if the connection is up.
+	 * @return bool|never Whether the connection is up.
+	 *
+	 * @phpstan-return ( $allow_bail is true ? bool|never : bool )
 	 */
 	public function check_connection( $allow_bail = true ) {
 		// Check if the connection is alive.
@@ -3056,7 +3058,7 @@ public function get_var( $query = null, $x = 0, $y = 0 ) {
 	 *                            correspond to an stdClass object, an associative array, or a numeric array,
 	 *                            respectively. Default OBJECT.
 	 * @param int         $y      Optional. Row to return. Indexed from 0. Default 0.
-	 * @return array|object|null|void Database query result in format specified by $output or null on failure.
+	 * @return array|object|null Database query result in format specified by $output or null on failure.
 	 */
 	public function get_row( $query = null, $output = OBJECT, $y = 0 ) {
 		$this->func_call = "\$db->get_row(\"$query\",$output,$y)";
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 4b6330a697780..8bf46ef0b871f 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -3766,7 +3766,7 @@ function wp_nonce_ays( $action ) {
  * }
  * @return never|void Returns void if `$args['exit']` is false, otherwise exits.
  *
- * @phpstan-return ( $args['exit'] is false ? void : never )
+ * @phpstan-return ( $args is array{exit: false} ? void : never )
  */
 function wp_die( $message = '', $title = '', $args = array() ) {
 	global $wp_query;
@@ -5501,6 +5501,8 @@ function wp_ob_end_flush_all() {
  * @since 2.3.2
  *
  * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @return never
  */
 function dead_db() {
 	global $wpdb;