diff --git a/src/bp-templates/bp-nouveau/js/buddypress-activity.js b/src/bp-templates/bp-nouveau/js/buddypress-activity.js
index d56842911a..5fc3b72ae8 100644
--- a/src/bp-templates/bp-nouveau/js/buddypress-activity.js
+++ b/src/bp-templates/bp-nouveau/js/buddypress-activity.js
@@ -1196,7 +1196,14 @@ window.bp = window.bp || {};
 							content.after( response.data.feedback );
 							content.parent().find( '.bp-feedback' ).hide().fadeIn( 300 );
 						} else {
-							$( content ).html( response.data.contents ).slideDown( 300 );
+							if ( $( content ).children( '.bb-poll-view' ).length ) {
+								// Make sure to replace content but not .bb-poll-view.
+								$( content ).children( ':not(.bb-poll-view)' ).remove();
+								$( content ).prepend( response.data.contents ).slideDown( 300 );
+
+							} else {
+								$( content ).html( response.data.contents ).slideDown( 300 );
+							}
 
 							// replace dummy image with original image by faking scroll event to call bp.Nouveau.lazyLoad.
 							jQuery( window ).scroll();