Index: /branches/plugin/bbp-includes/bbp-core-shortcodes.php
===================================================================
--- /branches/plugin/bbp-includes/bbp-core-shortcodes.php	(revision 3300)
+++ /branches/plugin/bbp-includes/bbp-core-shortcodes.php	(revision 3301)
@@ -690,10 +690,8 @@
 				bbp_get_template_part( 'bbpress/loop',       'topics' );
 				bbp_get_template_part( 'bbpress/pagination', 'topics' );
-				bbp_get_template_part( 'bbpress/form',       'topic'  );
 
 			// No topics
 			} else {
 				bbp_get_template_part( 'bbpress/no',   'topics' );
-				bbp_get_template_part( 'bbpress/form', 'topic'  );
 			}
 		}