Index: src/bp-templates/bp-legacy/buddypress-functions.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress-functions.php
+++ src/bp-templates/bp-legacy/buddypress-functions.php
@@ -84,11 +84,8 @@
 		add_action( 'bp_enqueue_community_scripts', array( $this, 'enqueue_scripts'  ) ); // Enqueue theme JS
 		add_action( 'bp_enqueue_community_scripts', array( $this, 'localize_scripts' ) ); // Enqueue theme script localization
 
-		/** This filter is documented in bp-core/bp-core-dependency.php */
-		if ( is_buddypress() || ! apply_filters( 'bp_enqueue_assets_in_bp_pages_only', true ) ) {
-			// Body no-js class.
-			add_filter( 'body_class', array( $this, 'add_nojs_body_class' ), 20, 1 );
-		}
+		// Body no-js class.
+		add_filter( 'body_class', array( $this, 'add_nojs_body_class' ), 20, 1 );
 
 		/** Buttons ***********************************************************/
 
@@ -480,6 +477,11 @@
 	 * @return array $classes
 	 */
 	public function add_nojs_body_class( $classes ) {
+		/** This filter is documented in bp-core/bp-core-dependency.php */
+		if ( ! is_buddypress() || apply_filters( 'bp_enqueue_assets_in_bp_pages_only', true ) ) {
+			return $classes;
+		}
+
 		if ( ! in_array( 'no-js', $classes ) )
 			$classes[] = 'no-js';
 
Index: src/bp-templates/bp-nouveau/buddypress-functions.php
===================================================================
--- src/bp-templates/bp-nouveau/buddypress-functions.php
+++ src/bp-templates/bp-nouveau/buddypress-functions.php
@@ -227,11 +227,8 @@
 		add_action( 'bp_enqueue_community_scripts', array( $this, 'localize_scripts' ) );
 		remove_action( 'bp_enqueue_community_scripts', 'bp_core_confirmation_js' );
 
-		/** This filter is documented in bp-core/bp-core-dependency.php */
-		if ( is_buddypress() || ! apply_filters( 'bp_enqueue_assets_in_bp_pages_only', true ) ) {
-			// Body no-js class.
-			add_filter( 'body_class', array( $this, 'add_nojs_body_class' ), 20, 1 );
-		}
+		// Body no-js class.
+		add_filter( 'body_class', array( $this, 'add_nojs_body_class' ), 20, 1 );
 
 		// Ajax querystring.
 		add_filter( 'bp_ajax_querystring', 'bp_nouveau_ajax_querystring', 10, 2 );
@@ -488,6 +485,11 @@
 	 * @return array $classes
 	 */
 	public function add_nojs_body_class( $classes ) {
+		/** This filter is documented in bp-core/bp-core-dependency.php */
+		if ( ! is_buddypress() || apply_filters( 'bp_enqueue_assets_in_bp_pages_only', true ) ) {
+			return $classes;
+		}
+
 		$classes[] = 'no-js';
 		return array_unique( $classes );
 	}