diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 11c513d..cb8d1d2 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -282,8 +282,13 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 			while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( "#/{$wp_rewrite->comments_pagination_base}-[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
-				$redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path']); // strip off feed endings
 				$redirect['path'] = preg_replace("#/{$wp_rewrite->comments_pagination_base}-[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing comment paging
+				// only strip comments/ from comment feed on site
+				if($redirect['path'] == preg_replace("#(https?:)?//[^/]+#","",get_feed_link('comments_rss2'))){
+					$redirect['path'] = preg_replace('#/(comments/)(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path']);
+				} else {
+					$redirect['path'] = preg_replace('#/(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path']); // strip off feed endings
+				}
 			}
 
 			$addl_path = '';