Index: bp-activity/bp-activity-loader.php
===================================================================
--- bp-activity/bp-activity-loader.php
+++ bp-activity/bp-activity-loader.php
@@ -107,6 +107,13 @@ class BP_Activity_Component extends BP_Component {
 		);
 
 		parent::setup_globals( $args );
+
+		// Set canonical stack on certain action items
+		if ( ! bp_displayed_user_id() && bp_is_activity_component() ) {
+			if ( bp_is_current_action( 'feed' ) ) {
+				$bp->canonical_stack['canonical_url'] = trailingslashit( bp_get_activity_directory_permalink() . 'feed' );
+			}
+		}
 	}
 
 	/**
Index: bp-core/bp-core-catchuri.php
===================================================================
--- bp-core/bp-core-catchuri.php
+++ bp-core/bp-core-catchuri.php
@@ -629,7 +629,7 @@ function bp_get_canonical_url( $args = array() ) {
 
 		// If requesting the front page component directory, canonical
 		// URL is the front page
-		if ( false !== $front_page_component && is_page( $page_on_front ) ) {
+		if ( false !== $front_page_component && is_page( $page_on_front ) && empty( $bp->canonical_stack['canonical_url'] ) ) {
 			$bp->canonical_stack['canonical_url'] = trailingslashit( bp_get_root_domain() );
 
 		// Except when the front page is set to the registration page