diff --git src/bp-templates/bp-legacy/buddypress-functions.php src/bp-templates/bp-legacy/buddypress-functions.php
index 2389457fa..e9f76a6ae 100644
--- src/bp-templates/bp-legacy/buddypress-functions.php
+++ src/bp-templates/bp-legacy/buddypress-functions.php
@@ -477,7 +477,7 @@ class BP_Legacy extends BP_Theme_Compat {
 	 */
 	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 ) ) {
+		if ( ! is_buddypress() && apply_filters( 'bp_enqueue_assets_in_bp_pages_only', true ) ) {
 			return $classes;
 		}
 
diff --git src/bp-templates/bp-nouveau/buddypress-functions.php src/bp-templates/bp-nouveau/buddypress-functions.php
index ff74bfdd1..dd6687ac7 100644
--- src/bp-templates/bp-nouveau/buddypress-functions.php
+++ src/bp-templates/bp-nouveau/buddypress-functions.php
@@ -476,7 +476,7 @@ class BP_Nouveau extends BP_Theme_Compat {
 	 */
 	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 ) ) {
+		if ( ! is_buddypress() && apply_filters( 'bp_enqueue_assets_in_bp_pages_only', true ) ) {
 			return $classes;
 		}