diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index 80e0b395ff..68cdd4800a 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -688,6 +688,8 @@ function set_screen_options() {
 				}
 				break;
 			default:
+				$screen_option = false;
+
 				if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $option ) {
 					/**
 					 * Filters a screen option value before it is set.
@@ -708,29 +710,27 @@ function set_screen_options() {
 					 * @param string $option        The option name.
 					 * @param int    $value         The option value.
 					 */
-					$value = apply_filters( 'set-screen-option', false, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
-				} else {
-					/**
-					 * Filters a screen option value before it is set.
-					 *
-					 * The dynamic portion of the hook, `$option`, refers to the option name.
-					 *
-					 * Returning false from the filter will skip saving the current option.
-					 *
-					 * @since 5.4.2
-					 * @since 5.4.3 Only applied to options not ending with '_page',
-					 *              and not the 'layout_columns' option.
-					 *
-					 * @see set_screen_options()
-					 *
-					 * @param mixed   $screen_option The value to save instead of the option value.
-					 *                               Default false (to skip saving the current option).
-					 * @param string  $option        The option name.
-					 * @param int     $value         The option value.
-					 */
-					$value = apply_filters( "set_screen_option_{$option}", false, $option, $value );
+					$screen_option = apply_filters( 'set-screen-option', $screen_option, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 				}
 
+				/**
+				 * Filters a screen option value before it is set.
+				 *
+				 * The dynamic portion of the hook, `$option`, refers to the option name.
+				 *
+				 * Returning false from the filter will skip saving the current option.
+				 *
+				 * @since 5.4.2
+				 *
+				 * @see set_screen_options()
+				 *
+				 * @param mixed   $screen_option The value to save instead of the option value.
+				 *                               Default false (to skip saving the current option).
+				 * @param string  $option        The option name.
+				 * @param int     $value         The option value.
+				 */
+				$value = apply_filters( "set_screen_option_{$option}", $screen_option, $option, $value );
+
 				if ( false === $value ) {
 					return;
 				}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8886fd83c9..7d6aeaebde 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-alpha-48822';
+$wp_version = '5.6-alpha-48823';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.