diff --git a/includes/class-sm-shortcodes.php b/includes/class-sm-shortcodes.php
index 16014d8..47ef2bf 100644
--- a/includes/class-sm-shortcodes.php
+++ b/includes/class-sm-shortcodes.php
@@ -848,7 +848,7 @@ function display_sermons( $atts = array() ) {
 			'post_type'      => 'wpfc_sermon',
 			'posts_per_page' => $args['per_page'],
 			'order'          => $args['order'],
-			'paged'          => get_query_var( 'paged' ),
+			'paged'          => get_query_var( 'paged' ) ?: (get_query_var( 'page' ) ?: 1),
 		);
 
 		// Check if it's a valid ordering argument.
@@ -1156,7 +1156,7 @@ function display_sermons( $atts = array() ) {
 									'current'  => $query->get( 'paged' ),
 									'total'    => $query->max_num_pages,
 									'end_size' => 3,
-									'add_args' => $add_args,
+									'add_args' => !is_front_page() ? $add_args : array(),
 								) );
 								?>
 							</div>