Index: bp-notifications/bp-notifications-functions.php
===================================================================
--- bp-notifications/bp-notifications-functions.php	(revision 7663)
+++ bp-notifications/bp-notifications-functions.php	(working copy)
@@ -122,8 +122,10 @@
 
 	// Setup local variables
 	$bp                    = buddypress();
+	$active_components = array_keys(  $bp->active_components );
 	$notifications         = BP_Notifications_Notification::get( array(
-		'user_id' => $user_id,
+		'user_id'        => $user_id,
+		'component_name' => $active_components,
 	) );
 	$grouped_notifications = array(); // Notification groups
 	$renderable            = array(); // Renderable notifications