diff --git a/includes/class-sensei-course.php b/includes/class-sensei-course.php
index 666e3d30be..b05dc6ebbd 100755
--- a/includes/class-sensei-course.php
+++ b/includes/class-sensei-course.php
@@ -2810,7 +2810,7 @@ public static function the_course_lessons_title() {
 
 		} elseif ( empty( $none_module_lessons ) ) { // if the none module lessons are simply empty the title should not be shown
 
-			$title = '';
+			return;
 		}
 
 		/**
@@ -3161,7 +3161,7 @@ public static function the_course_video() {
 	}
 
 	/**
-	 * Output the title for the single lesson page
+	 * Output the title for the single course page
 	 *
 	 * @global $post
 	 * @since 1.9.0
@@ -3173,23 +3173,21 @@ public static function the_title() {
 		}
 		global $post;
 
-		?>
-		<header>
-
-			<h1>
-
-				<?php
-				/**
-				 * Filter documented in class-sensei-messages.php the_title
-				 */
-				echo wp_kses_post( apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type ) );
-				?>
-
-			</h1>
-
-		</header>
-
-		<?php
+		/**
+		 * Filter documented in class-sensei-messages.php the_title
+		 */
+		$title = wp_kses_post( apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type ) );
+		if ( $title ) :
+			?>
+			<header>
+				<h1>
+					<?php
+					echo wp_kses_post( $title );
+					?>
+				</h1>
+			</header>
+			<?php
+		endif;
 
 	}//end the_title()
 
diff --git a/includes/class-sensei-lesson.php b/includes/class-sensei-lesson.php
index 117dbc3e9f..979677229c 100755
--- a/includes/class-sensei-lesson.php
+++ b/includes/class-sensei-lesson.php
@@ -4184,30 +4184,30 @@ public static function the_title() {
 		$is_preview = isset( $post->ID )
 			&& Sensei_Utils::is_preview_lesson( $post->ID )
 			&& ! Sensei_Course::is_user_enrolled( $course_id, $current_user->ID );
-
-		?>
-		<header class="lesson-title">
-
-			<h1>
-
-				<?php
-				/**
-				 * Filter documented in class-sensei-messages.php the_title
-				 */
-				echo wp_kses_post( apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type ) );
+		/**
+		 * Filter documented in class-sensei-messages.php the_title
+		 */
+		$title = wp_kses_post( apply_filters( 'sensei_single_title', get_the_title( $post ), $post->post_type ) );
+		if ( $title || $is_preview ) :
+			?>
+			<header class="lesson-title">
+				<?php if ( $title ) : ?>
+					<h1>
+						<?php
+						echo wp_kses_post( $title );
+						?>
+					</h1>
+					<?php
+				endif;
+				if ( $is_preview ) {
+					echo wp_kses_post( Sensei()->frontend->sensei_lesson_preview_title_tag( $course_id ) );
+				}
 				?>
 
-			</h1>
+			</header>
 
 			<?php
-			if ( $is_preview ) {
-				echo wp_kses_post( Sensei()->frontend->sensei_lesson_preview_title_tag( $course_id ) );
-			}
-			?>
-
-		</header>
-
-		<?php
+		endif;
 
 	}//end the_title()
 
diff --git a/includes/class-sensei-messages.php b/includes/class-sensei-messages.php
index 60e4432994..e016b4fec9 100755
--- a/includes/class-sensei-messages.php
+++ b/includes/class-sensei-messages.php
@@ -745,31 +745,27 @@ public static function the_title() {
 		} else {
 			$title = esc_html( get_the_title( $post->ID ) );
 		}
-
-		?>
-		<header>
-
-			<h1>
-
-				<?php
-				/**
-				 * Filter Sensei single title
-				 *
-				 * @since 1.8.0
-				 * @param string $title
-				 * @param string $template
-				 * @param string $post_type
-				 */
-				echo wp_kses_post( apply_filters( 'sensei_single_title', $title, $post->post_type ) );
-				?>
-
-			</h1>
-
-		</header>
-
-		<?php
-
-	} // End sensei_single_title()
+		/**
+		 * Filter Sensei single title
+		 *
+		 * @since 1.8.0
+		 * @param string $title
+		 * @param string $template
+		 * @param string $post_type
+		 */
+		$title = wp_kses_post( apply_filters( 'sensei_single_title', $title, $post->post_type ) );
+		if ( $title ) :
+			?>
+			<header>
+				<h1>
+					<?php
+					echo wp_kses_post( $title );
+					?>
+				</h1>
+			</header>
+			<?php
+		endif;
+	}//end the_title()
 
 	/**
 	 * Generates the my messages
diff --git a/includes/class-sensei-quiz.php b/includes/class-sensei-quiz.php
index 24dd9aa4c7..bc6f34966a 100755
--- a/includes/class-sensei-quiz.php
+++ b/includes/class-sensei-quiz.php
@@ -1184,23 +1184,21 @@ public static function stop_quiz_questions_loop() {
 	 * @since 1.9.0
 	 */
 	public static function the_title() {
-		?>
-		 <header>
-
-			 <h1>
-
-				<?php
-				/**
-				 * Filter documented in class-sensei-messages.php the_title
-				 */
-				echo wp_kses_post( apply_filters( 'sensei_single_title', get_the_title( get_post() ), get_post_type( get_the_ID() ) ) );
-				?>
-
-			 </h1>
-
-		 </header>
-
-		 <?php
+		/**
+		 * Filter documented in class-sensei-messages.php the_title
+		 */
+		$title = wp_kses_post( apply_filters( 'sensei_single_title', get_the_title( get_post() ), get_post_type( get_the_ID() ) ) );
+		if ( $title ) :
+			?>
+			<header>
+				<h1>
+					<?php
+					echo wp_kses_post( $title );
+					?>
+				</h1>
+			</header>
+			<?php
+		endif;
 	}//end the_title()
 
 	/**
diff --git a/templates/single-course/lessons.php b/templates/single-course/lessons.php
index a6e6b2cc96..79a85af0bd 100644
--- a/templates/single-course/lessons.php
+++ b/templates/single-course/lessons.php
@@ -7,97 +7,90 @@
  * @author      Automattic
  * @package     Sensei
  * @category    Templates
- * @version     1.9.0
+ * @version     3.2.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
-?>
-
-<section class="course-lessons">
-
-	<?php
 
-		/**
-		 * Actions just before the sensei single course lessons loop begins
-		 *
-		 * @hooked Sensei_Course::load_single_course_lessons_query
-		 * @since 1.9.0
-		 */
-		do_action( 'sensei_single_course_lessons_before' );
+/**
+ * Actions just before the sensei single course lessons loop begins
+ *
+ * @hooked Sensei_Course::load_single_course_lessons_query
+ * @since 1.9.0
+ */
+do_action( 'sensei_single_course_lessons_before' );
 
+// lessons loaded into loop in the sensei_single_course_lessons_before hook
+if ( have_posts() ) :
 	?>
 
-	<?php
+	<section class="course-lessons">
 
-	// lessons loaded into loop in the sensei_single_course_lessons_before hook
-	if ( have_posts() ) :
+	<?php
+	// start course lessons loop
+	while ( have_posts() ) :
+		the_post();
+		?>
+
+		<article <?php post_class(); ?> >
+
+			<?php
+
+				/**
+				 * The hook is inside the course lesson on the single course. It fires
+				 * for each lesson. It is just before the lesson excerpt.
+				 *
+				 * @since 1.9.0
+				 *
+				 * @param $lessons_id
+				 *
+				 * @hooked Sensei_Lesson::the_lesson_meta -  5
+				 * @hooked Sensei_Lesson::the_lesson_thumbnail - 8
+				 */
+				do_action( 'sensei_single_course_inside_before_lesson', get_the_ID() );
 
-		// start course lessons loop
-		while ( have_posts() ) :
-			the_post();
 			?>
 
-			<article <?php post_class(); ?> >
+			<section class="entry">
 
 				<?php
-
-					/**
-					 * The hook is inside the course lesson on the single course. It fires
-					 * for each lesson. It is just before the lesson excerpt.
-					 *
-					 * @since 1.9.0
-					 *
-					 * @param $lessons_id
-					 *
-					 * @hooked Sensei_Lesson::the_lesson_meta -  5
-					 * @hooked Sensei_Lesson::the_lesson_thumbnail - 8
-					 */
-					do_action( 'sensei_single_course_inside_before_lesson', get_the_ID() );
-
+				/**
+				 * Display the lesson excerpt
+				 */
+				the_excerpt();
 				?>
 
-				<section class="entry">
-
-					<?php
-					/**
-					 * Display the lesson excerpt
-					 */
-					the_excerpt();
-					?>
+			</section>
 
-				</section>
+			<?php
 
-				<?php
-
-					/**
-					 * The hook is inside the course lesson on the single course. It is just before the lesson closing markup.
-					 * It fires for each lesson.
-					 *
-					 * @since 1.9.0
-					 */
-					do_action( 'sensei_single_course_inside_after_lesson', get_the_ID() );
-
-				?>
+				/**
+				 * The hook is inside the course lesson on the single course. It is just before the lesson closing markup.
+				 * It fires for each lesson.
+				 *
+				 * @since 1.9.0
+				 */
+				do_action( 'sensei_single_course_inside_after_lesson', get_the_ID() );
 
-			</article>
+			?>
 
-		<?php endwhile; // end course lessons loop ?>
+		</article>
 
-	<?php endif; ?>
+	<?php endwhile; // end course lessons loop ?>
 
-	<?php
+	</section>
 
-		/**
-		 * Actions just before the sensei single course lessons loop begins
-		 *
-		 * @hooked Sensei_Course::reset_single_course_query
-		 *
-		 * @since 1.9.0
-		 */
-		do_action( 'sensei_single_course_lessons_after' );
+<?php endif;
 
-	?>
+/**
+ * Actions just before the sensei single course lessons loop begins
+ *
+ * @hooked Sensei_Course::reset_single_course_query
+ *
+ * @since 1.9.0
+ */
+do_action( 'sensei_single_course_lessons_after' );
 
-</section>
+?>