diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 1b148e2682..3fbe46c18a 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -94,7 +94,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 
 		if ( ! $redirect_url ) {
 			$redirect_url = redirect_guess_404_permalink( $requested_url );
-			$redirect['query'] = remove_query_arg( array( 'p', 'page_id', 'attachment_id', 'post_type', 'pagename', 'name' ), $redirect['query'] );
+			$redirect['query'] = remove_query_arg( array( 'post_type', 'pagename', 'name' ), $redirect['query'] );
 		}
 
 	} elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {