diff --git src/bp-core/bp-core-filters.php src/bp-core/bp-core-filters.php
index 069014a..34036f9 100644
--- src/bp-core/bp-core-filters.php
+++ src/bp-core/bp-core-filters.php
@@ -370,7 +370,7 @@ function bp_core_activation_signup_user_notification( $user, $user_email, $key,
 				return $user;
 			}
 
-		/** 
+		/**
 		 * There can be a case where the user was created without the skip confirmation
 		 * And the super admin goes in pending accounts to resend it. In this case, as the
 		 * meta['password'] is not set, the activation url must be WordPress one
@@ -605,3 +605,11 @@ add_filter( 'wp_setup_nav_menu_item', 'bp_setup_nav_menu_item', 10, 1 );
 function bp_filter_metaid_column_name( $q ) {
 	return str_replace( 'meta_id', 'id', $q );
 }
+
+function bp_core_edit_post_link( $edit_link = '', $post_id = 0 ) {
+	if ( 0 === $post_id ) {
+		$edit_link = false;
+	}
+
+	return $edit_link;
+}
diff --git src/bp-core/bp-core-theme-compatibility.php src/bp-core/bp-core-theme-compatibility.php
index 7911c5b..bfaa4ae 100644
--- src/bp-core/bp-core-theme-compatibility.php
+++ src/bp-core/bp-core-theme-compatibility.php
@@ -558,7 +558,7 @@ function bp_theme_compat_reset_post( $args = array() ) {
 	bp_set_theme_compat_active( true );
 
 	// If we are in theme compat, we don't need the 'Edit' post link
-	add_filter( 'get_edit_post_link', '__return_false' );
+	add_filter( 'get_edit_post_link', 'bp_core_edit_post_link', 10, 2 );
 }
 
 /**