diff --git src/bp-members/classes/class-bp-members-component.php src/bp-members/classes/class-bp-members-component.php
index a83344feb..73b63348b 100644
--- src/bp-members/classes/class-bp-members-component.php
+++ src/bp-members/classes/class-bp-members-component.php
@@ -473,7 +473,6 @@ class BP_Members_Component extends BP_Component {
 			 */
 			'BP_REST_Components_Endpoint',
 			'BP_REST_Members_Endpoint',
-			'BP_REST_Attachments_Member_Avatar_Endpoint',
 		) );
 	}
 }
diff --git src/bp-xprofile/classes/class-bp-xprofile-component.php src/bp-xprofile/classes/class-bp-xprofile-component.php
index b43879d34..49ae02dd5 100644
--- src/bp-xprofile/classes/class-bp-xprofile-component.php
+++ src/bp-xprofile/classes/class-bp-xprofile-component.php
@@ -503,6 +503,7 @@ class BP_XProfile_Component extends BP_Component {
 			'BP_REST_XProfile_Fields_Endpoint',
 			'BP_REST_XProfile_Field_Groups_Endpoint',
 			'BP_REST_XProfile_Data_Endpoint',
+			'BP_REST_Attachments_Member_Avatar_Endpoint',
 		) );
 	}
 }
diff --git tests/phpunit/testcases/core/class-bp-component.php tests/phpunit/testcases/core/class-bp-component.php
index bb8ad1b90..c5a5dd2b6 100644
--- tests/phpunit/testcases/core/class-bp-component.php
+++ tests/phpunit/testcases/core/class-bp-component.php
@@ -32,7 +32,6 @@ class BP_Tests_BP_Component_TestCases extends BP_UnitTestCase {
 		$this->assertSame( $bp->unit_test_rest->controllers, array(
 			'BP_REST_Components_Endpoint',
 			'BP_REST_Members_Endpoint',
-			'BP_REST_Attachments_Member_Avatar_Endpoint',
 		) );
 	}
 
@@ -48,7 +47,6 @@ class BP_Tests_BP_Component_TestCases extends BP_UnitTestCase {
 
 		$this->assertSame( $bp->unit_test_rest->controllers, array(
 			'BP_REST_Components_Endpoint',
-			'BP_REST_Attachments_Member_Avatar_Endpoint',
 		) );
 	}
 
@@ -65,7 +63,6 @@ class BP_Tests_BP_Component_TestCases extends BP_UnitTestCase {
 		$this->assertSame( $bp->unit_test_rest->controllers, array(
 			'BP_REST_Components_Endpoint',
 			'BP_REST_Members_Endpoint',
-			'BP_REST_Attachments_Member_Avatar_Endpoint',
 		) );
 	}
 }