diff --git wp-includes/canonical.php wp-includes/canonical.php
index 423dcc6..6bc4c1d 100644
--- wp-includes/canonical.php
+++ wp-includes/canonical.php
@@ -218,8 +218,17 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 			$redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
 		}
 
+		// check for query vars other than feed that have values that match feed slugs
+		$no_feed_vars = true;
+		foreach ( $GLOBALS['wp']->query_vars as $var => $slug ) {
+			if ( preg_match( '#^feed|rss2?|rdf|atom$#', $slug ) && 'feed' !== $var ) {
+				$no_feed_vars = false;
+				break;
+			}
+		}
+
 		// paging and feeds
-		if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
+		if ( get_query_var('paged') || ( is_feed() && $no_feed_vars ) || get_query_var('cpage') ) {
 			while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( '#/comment-page-[0-9]+(/+)?$#', $redirect['path'] ) ) {
 				// Strip off paging and feed
 				$redirect['path'] = preg_replace("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing paging