diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 991cfb6bcb..b44c427b58 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -280,6 +280,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 				unset( $_parsed_query['name'] );
 		}
 
+		$_parsed_query = array_map( 'rawurlencode', $_parsed_query );
 		$redirect_url = add_query_arg( $_parsed_query, $redirect_url );
 	}