diff --git a/bp-loader.php b/bp-loader.php
index 2cbe02c..cacb060 100644
--- a/bp-loader.php
+++ b/bp-loader.php
@@ -530,6 +530,13 @@ class BuddyPress {
 	 * @todo Move bp-default to wordpress.org/extend/themes and remove this
 	 */
 	public function register_theme_directory() {
+
+		// Don't register the bundled version of BP-Default if the user already has it.
+		foreach ( array_values( (array) $GLOBALS['wp_theme_directories'] ) as $directory ) {
+			if ( is_dir( $directory . '/bp-default' ) )
+				return;
+		}
+
 		register_theme_directory( $this->old_themes_dir );
 	}