Index: bp-core-template.php
===================================================================
--- bp-core-template.php	(revision 7365)
+++ bp-core-template.php	(working copy)
@@ -860,7 +860,7 @@
 		}
 
 	// Page template fallback check if $bp->current_component is empty
-	} elseif ( !is_admin() && is_page() ) {
+	} elseif ( !is_admin() && is_page() && ! empty( $component ) ) {
 		global $wp_query;
 		$page          = $wp_query->get_queried_object();
 		$custom_fields = get_post_custom_values( '_wp_page_template', $page->ID );