Index: bbp-includes/bbp-common-template.php
===================================================================
--- bbp-includes/bbp-common-template.php	(revision 4206)
+++ bbp-includes/bbp-common-template.php	(working copy)
@@ -1209,6 +1209,14 @@
 		$retval    = '';
 		$posts     = get_posts( $r );
 
+		/** If the $selected item is not in the resultset, let's add it so it
+		 *  doesn't break when updating  **************************************/
+
+		if ( !empty( $posts ) && intval( $r['selected'] ) > 0 && !in_array( $r['selected'], wp_list_pluck( $posts, 'ID' ) ) ) {
+			$selected_post = get_post( $r['selected'] );
+			$posts[]       = $selected_post;
+		}
+
 		/** Drop Down *********************************************************/
 
 		// Items found