diff --git src/bp-core/bp-core-avatars.php src/bp-core/bp-core-avatars.php
index 8b98657..ee251e3 100644
--- src/bp-core/bp-core-avatars.php
+++ src/bp-core/bp-core-avatars.php
@@ -1326,8 +1326,8 @@ add_action( 'wp_ajax_bp_avatar_set', 'bp_avatar_ajax_set' );
 function bp_core_fetch_avatar_filter( $avatar, $user, $size, $default, $alt = '', $args = array() ) {
 	global $pagenow;
 
-	// Do not filter if inside WordPress options page.
-	if ( 'options-discussion.php' == $pagenow )
+	// Don't filter if inside WordPress options page and force_default is true.
+	if ( 'options-discussion.php' === $pagenow && true === $args['force_default'] )
 		return $avatar;
 
 	// If passed an object, assume $user->user_id.