diff --git bp-activity/bp-activity-functions.php bp-activity/bp-activity-functions.php
index d60cd2c..a7193b4 100644
--- bp-activity/bp-activity-functions.php
+++ bp-activity/bp-activity-functions.php
@@ -1457,7 +1457,7 @@ function bp_activity_hide_user_activity( $user_id ) {
 function bp_activity_thumbnail_content_images( $content, $link = false ) {
 
 	preg_match_all( '/<img[^>]*>/Ui', $content, $matches );
-	$content = preg_replace('|(\[caption(.*?)\])?<img[^>]*>(\[/caption\])?|', '', $content );
+	$content = preg_replace('|(\[caption(.*?)\])?<img[^>]*>.*?(?:\[\/caption\])|', '', $content );
 
 	if ( !empty( $matches ) && !empty( $matches[0] ) ) {
 		// Get the SRC value