diff --git a/includes/template-tags.php b/includes/template-tags.php
index 3e8bd76..2125ebd 100755
--- a/includes/template-tags.php
+++ b/includes/template-tags.php
@@ -17,6 +17,7 @@
 add_action( 'sermon_audio', 'wpfc_sermon_audio', 5 );
 add_action( 'sermon_single', 'wpfc_sermon_single' );
 add_action( 'sermon_excerpt', 'wpfc_sermon_excerpt' );
+add_filter( 'the_content', 'add_wpfc_sermon_content' );
 
 // Include template for displaying sermons
 function sermon_template_include( $template ) {
@@ -438,8 +439,11 @@ function render_wpfc_sermon_excerpt() {
 	do_action( 'sermon_excerpt' );
 }
 
-function wpfc_sermon_excerpt() {
-	global $post; ?>
+function wpfc_sermon_excerpt( $return = false ) {
+	global $post;
+
+	ob_start();
+	?>
     <div class="wpfc_sermon_wrap cf">
         <div class="wpfc_sermon_image">
 			<?php render_sermon_image( apply_filters( 'wpfc_sermon_excerpt_sermon_image_size', 'sermon_small' ) ); ?>
@@ -464,16 +468,23 @@ function wpfc_sermon_excerpt() {
 		<?php endif; ?>
     </div>
 	<?php
+
+	$output = ob_get_clean();
+
+	if ( ! $return ) {
+		echo $output;
+	}
+
+	return $output;
 }
 
 function add_wpfc_sermon_content( $content ) {
 	if ( 'wpfc_sermon' == get_post_type() && in_the_loop() == true ) {
 		if ( ! is_feed() && ( is_archive() || is_search() ) ) {
-			$new_content = render_wpfc_sermon_excerpt();
+			$content = wpfc_sermon_excerpt( true );
 		} elseif ( is_singular() && is_main_query() ) {
-			$new_content = wpfc_sermon_single();
+			$content = wpfc_sermon_single( true );
 		}
-		$content = $new_content;
 	}
 
 	return $content;
diff --git a/readme.txt b/readme.txt
index e4945d1..689fa23 100755
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: church, sermon, sermons, preaching, podcasting, manage, managing, podcasts
 Requires at least: 4.5  
 Tested up to: 4.8.2  
 Requires PHP: 5.3  
-Stable tag: 2.8.4
+Stable tag: 2.8.5
 License: GPLv2  
 License URI: https://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -93,6 +93,9 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 2. Sermon Files
 
 ## Changelog ##
+### 2.8.5 ###
+* Revert to old rendering engine, until we fix new one
+
 ### 2.8.4 ###
 * Fix sermons having to be resaved to work
 * Fix fatal error when using plugin views
diff --git a/sermons.php b/sermons.php
index de9b513..b7f416a 100755
--- a/sermons.php
+++ b/sermons.php
@@ -3,7 +3,7 @@
  * Plugin Name: Sermon Manager for WordPress
  * Plugin URI: https://www.wpforchurch.com/products/sermon-manager-for-wordpress/
  * Description: Add audio and video sermons, manage speakers, series, and more.
- * Version: 2.8.4
+ * Version: 2.8.5
  * Author: WP for Church
  * Author URI: https://www.wpforchurch.com/
  * Requires at least: 4.5