Index: src/includes/common/functions.php
===================================================================
--- src/includes/common/functions.php	(revision 7287)
+++ src/includes/common/functions.php	(working copy)
@@ -2616,9 +2616,13 @@
 	if ( isset( $wp_query->bbp_is_404 ) ) {
 
 		// Either force a 404 when 200, or a 200 when 404
-		$override = ( true === $wp_query->bbp_is_404 )
-			? bbp_set_404( $wp_query )
-			: bbp_set_200();
+		if ( true === $wp_query->bbp_is_404 ) {
+			bbp_set_404( $wp_query );
+		} else {
+			bbp_set_200();
+		}
+
+		return true;
 	}
 
 	// Return, maybe overridden