Index: bp-core/bp-core-template-loader.php
===================================================================
--- bp-core/bp-core-template-loader.php
+++ bp-core/bp-core-template-loader.php
@@ -200,6 +200,9 @@ function bp_get_template_stack() {
  * @return string
  */
 function bp_buffer_template_part( $slug, $name = null, $echo = true ) {
+	// Remove all filters from the_content
+	bp_remove_all_filters( 'the_content' );
+
 	ob_start();
 
 	// Remove 'bp_replace_the_content' filter to prevent infinite loops
Index: bp-core/bp-core-theme-compatibility.php
===================================================================
--- bp-core/bp-core-theme-compatibility.php
+++ bp-core/bp-core-theme-compatibility.php
@@ -521,9 +521,6 @@ function bp_template_include_theme_compat( $template = '' ) {
 	 */
 	if ( bp_is_theme_compat_active() ) {
 
-		// Remove all filters from the_content
-		bp_remove_all_filters( 'the_content' );
-
 		// Add a filter on the_content late, which we will later remove
 		if ( ! has_filter( 'the_content', 'bp_replace_the_content' ) ) {
 			add_filter( 'the_content', 'bp_replace_the_content' );