Index: bp-activity/bp-activity-actions.php
===================================================================
--- bp-activity/bp-activity-actions.php	(revision 4050)
+++ bp-activity/bp-activity-actions.php	(working copy)
@@ -247,7 +247,7 @@
 function bp_activity_action_friends_feed() {
 	global $bp, $wp_query;
 
-	if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || !bp_is_current_action( $bp->friends->slug ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+	if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || ( bp_is_active( 'friends' ) && !bp_is_current_action( $bp->friends->slug ) ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
 		return false;
 
 	$wp_query->is_404 = false;
@@ -261,7 +261,7 @@
 function bp_activity_action_my_groups_feed() {
 	global $bp, $wp_query;
 
-	if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || !bp_is_current_action( $bp->groups->slug ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
+	if ( ( $bp->activity->slug != bp_current_component() ) || !bp_is_user() || ( bp_is_active( 'groups' ) && !bp_is_current_action( $bp->groups->slug ) ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
 		return false;
 
 	$wp_query->is_404 = false;